diff --git a/examples/config/debug.yaml b/examples/config/debug.yaml
index a28c04320..94de168f4 100644
--- a/examples/config/debug.yaml
+++ b/examples/config/debug.yaml
@@ -1,13 +1,11 @@
 material:       [basic, extensive]                  # material.f90,        possible values: basic, extensive
 constitutive:   [basic, extensive, selective]       # constitutive_*.f90   possible values: basic, extensive, selective
-crystallite:    [basic, extensive, selective]       # crystallite.f90      possible values: basic, extensive, selective
-homogenization: [basic, extensive, selective]       # homogenization_*.f90 possible values: basic, extensive, selective
 cpfem:          [basic, extensive, selective]       # CPFEM.f90            possible values: basic, extensive, selective
-#
-# Parameters for selective
-element:          1                    # selected element for debugging 
-integrationpoint: 1                    # selected integration point for debugging 
-grain:            1                    # selected grain at ip for debugging
+
+# options for selective debugging
+element:          1
+integrationpoint: 1
+grain:            1
 
 # solver-specific
 mesh: [basic]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cb697013..c20754a67 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB damask-sources *.f90 *.c)
 
 # probably we should have a subfolder for MSC.Marc
 list(FILTER damask-sources EXCLUDE REGEX ".*CPFEM.f90")
-list(FILTER damask-sources EXCLUDE REGEX ".*DAMASK_marc.*.f90")
+list(FILTER damask-sources EXCLUDE REGEX ".*DAMASK_Marc.*.f90")
 list(FILTER damask-sources EXCLUDE REGEX ".*commercialFEM_fileList.*.f90")
 
 
diff --git a/src/phase.f90 b/src/phase.f90
index add26ae0b..5a9eaa518 100644
--- a/src/phase.f90
+++ b/src/phase.f90
@@ -58,8 +58,6 @@ module phase
       grain
   end type tDebugOptions
 
-  type(tDebugOptions) :: debugCrystallite
-
   integer, dimension(:), allocatable, public :: &                                                   !< ToDo: should be protected (bug in Intel compiler)
     phase_elasticityInstance, &
     phase_NstiffnessDegradations
@@ -497,15 +495,11 @@ subroutine crystallite_init()
 
   class(tNode), pointer :: &
     num_crystallite, &
-    debug_crystallite, &                                                                            ! pointer to debug options for crystallite
     phases
 
 
   print'(/,a)', ' <<<+-  crystallite init  -+>>>'
 
-  debug_crystallite => config_debug%get('crystallite', defaultVal=emptyList)
-  debugCrystallite%extensive = debug_crystallite%contains('extensive')
-
   cMax = homogenization_maxNconstituents
   iMax = discretization_nIPs
   eMax = discretization_Nelems