diff --git a/code/Makefile b/code/Makefile
index 5efdadea8..51c5b4900 100644
--- a/code/Makefile
+++ b/code/Makefile
@@ -315,7 +315,7 @@ VACANCY_FILES = \
    vacancy_constant.o vacancy_generation.o
 
 PLASTIC_FILES = \
-   plastic_dislotwin.o plastic_disloKMC.o plastic_disloUCLA.o plastic_j2.o plastic_phenopowerlaw.o \
+   plastic_dislotwin.o plastic_disloUCLA.o plastic_disloKMC.o plastic_j2.o plastic_phenopowerlaw.o \
    plastic_titanmod.o plastic_nonlocal.o plastic_none.o constitutive.o
    
 
@@ -428,14 +428,7 @@ crystallite.o:                 crystallite.f90 \
                                constitutive.o 
                             
 constitutive.o:                constitutive.f90 \
-                               plastic_nonlocal.o \
-                               plastic_titanmod.o \
-                               plastic_dislotwin.o \
-                               plastic_disloKMC.o \
-                               plastic_disloUCLA.o \
-                               plastic_phenopowerlaw.o \
-                               plastic_j2.o \
-                               plastic_none.o \
+                               $(PLASTIC_FILES) \
                                $(DAMAGE_FILES) \
                                $(THERMAL_FILES) \
                                $(VACANCY_FILES)
diff --git a/code/homogenization_RGC.f90 b/code/homogenization_RGC.f90
index 7fe024039..d39d8b610 100644
--- a/code/homogenization_RGC.f90
+++ b/code/homogenization_RGC.f90
@@ -336,7 +336,6 @@ subroutine homogenization_RGC_partitionDeformation(F,avgF,ip,el)
  use material, only: &
    homogenization_maxNgrains, &
    homogenization_Ngrains,&
-   homogState, &
    mappingHomogenization, & 
    homogenization_typeInstance
  use FEsolving, only: &
@@ -904,8 +903,7 @@ subroutine homogenization_RGC_averageStressAndItsTangent(avgP,dAvgPdAvgF,P,dPdF,
  use mesh,  only: mesh_element
  use material, only: &
   homogenization_maxNgrains, &
-   homogState, &
-   mappingHomogenization, &
+  mappingHomogenization, &
   homogenization_Ngrains, &
   homogenization_typeInstance 
  use math, only: math_Plain3333to99