diff --git a/src-3.0/GF/Compile.hs b/src-3.0/GF/Compile.hs
index d09527982..d773febbd 100644
--- a/src-3.0/GF/Compile.hs
+++ b/src-3.0/GF/Compile.hs
@@ -5,7 +5,7 @@ import GF.Compile.GetGrammar
 import GF.Compile.Extend
 import GF.Compile.Rebuild
 import GF.Compile.Rename
-import GF.Devel.CheckGrammar
+import GF.Compile.CheckGrammar
 import GF.Compile.Optimize
 import GF.Devel.OptimizeGF
 import GF.Devel.GrammarToGFCC
diff --git a/src-3.0/GF/Devel/CheckGrammar.hs b/src-3.0/GF/Compile/CheckGrammar.hs
similarity index 99%
rename from src-3.0/GF/Devel/CheckGrammar.hs
rename to src-3.0/GF/Compile/CheckGrammar.hs
index 3648b610a..e556ea3ab 100644
--- a/src-3.0/GF/Devel/CheckGrammar.hs
+++ b/src-3.0/GF/Compile/CheckGrammar.hs
@@ -21,7 +21,7 @@
 --  - tables are type-annotated
 -----------------------------------------------------------------------------
 
-module GF.Devel.CheckGrammar (
+module GF.Compile.CheckGrammar (
   showCheckModule, justCheckLTerm, allOperDependencies, topoSortOpers) where
 
 import GF.Grammar.Grammar
diff --git a/src-3.0/GF/Compile/Optimize.hs b/src-3.0/GF/Compile/Optimize.hs
index 909b8fda8..863f11d4c 100644
--- a/src-3.0/GF/Compile/Optimize.hs
+++ b/src-3.0/GF/Compile/Optimize.hs
@@ -25,9 +25,8 @@ import GF.Grammar.Predef
 import GF.Grammar.Refresh
 import GF.Devel.Compute
 import GF.Compile.BackOpt
-import GF.Devel.CheckGrammar
+import GF.Compile.CheckGrammar
 import GF.Compile.Update
---import GF.Compile.Evaluate
 
 import GF.Data.Operations
 import GF.Infra.CheckM