diff --git a/Tools/CodeGen/CactusBoundary.m b/Tools/CodeGen/CactusBoundary.m
index f4d362de..81cf6701 100644
--- a/Tools/CodeGen/CactusBoundary.m
+++ b/Tools/CodeGen/CactusBoundary.m
@@ -166,18 +166,14 @@
        Map[createBoundScalarParam, Map[unqualifiedGroupName,evolvedGroups]]]]];
  
 
-GetSources[evolvedGroups_, declaredGroups_, groups_, implementation_, thornName_] :=
+GetSources[declaredGroups_, groups_, implementation_, thornName_] :=
   Module[{boundarySpec, evolvedGFs},
-    evolvedGroups2 = MoLEvolvedGroups[declaredGroups, groups];
-
-    If[Union@evolvedGroups2 =!= Union[evolvedGroups],
-       Print["Group mismatch"];
-       Quit[1]];
+    evolvedGroups = MoLEvolvedGroups[declaredGroups, groups];
+    evolvedGFs = variablesFromGroups[evolvedGroups, groups];
 
-    evolvedGFs = variablesFromGroups[evolvedGroups2, groups];
     boundarySpec = 
     {
-      Groups -> evolvedGroups2, 
+      Groups -> evolvedGroups,
       EvolvedGFs -> Map[qualifyGFName[#, groups, implementation] &, evolvedGFs],
       BaseImplementation -> implementation, 
       ThornName -> thornName,
diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m
index a507e65f..ac6746e9 100644
--- a/Tools/CodeGen/KrancThorn.m
+++ b/Tools/CodeGen/KrancThorn.m
@@ -343,7 +343,7 @@ Thorn generation (main entry point for non-tensorial thorns)
 
     sources = Join[
       sources,
-      CactusBoundary`GetSources[evolvedGroups, declaredGroups, groups, implementation, thornName]];
+      CactusBoundary`GetSources[declaredGroups, groups, implementation, thornName]];
 
     (* ------------------------------------------------------------------------ 
        Add parameter check source file