diff --git a/lib/resource-1.0/abstract/Lang.gf b/lib/resource-1.0/abstract/Lang.gf
index 6534dbf64..5586df2da 100644
--- a/lib/resource-1.0/abstract/Lang.gf
+++ b/lib/resource-1.0/abstract/Lang.gf
@@ -6,18 +6,6 @@
 -- which may be more suitable to open in applications.
 
 abstract Lang = 
-  Noun,
-  Verb, 
-  Adjective,
-  Adverb,
-  Numeral,
-  Sentence, 
-  Question,
-  Relative,
-  Conjunction,
-  Phrase,
-  Text,
-  Structural,
-  Idiom,
+  Grammar,
   Lexicon
   ** {} ;
diff --git a/lib/resource-1.0/danish/LangDan.gf b/lib/resource-1.0/danish/LangDan.gf
index 3b2a64681..7a80aded4 100644
--- a/lib/resource-1.0/danish/LangDan.gf
+++ b/lib/resource-1.0/danish/LangDan.gf
@@ -1,19 +1,7 @@
 --# -path=.:../scandinavian:../abstract:../common:prelude
 
 concrete LangDan of Lang = 
-  NounDan, 
-  VerbDan, 
-  AdjectiveDan,
-  AdverbDan,
-  NumeralDan,
-  SentenceDan,
-  QuestionDan,
-  RelativeDan,
-  ConjunctionDan,
-  PhraseDan,
-  TextX,
-  IdiomDan,
-  StructuralDan,
+  GrammarDan,
   LexiconDan
   ** {
 
diff --git a/lib/resource-1.0/english/LangEng.gf b/lib/resource-1.0/english/LangEng.gf
index 402de1fef..966308a2b 100644
--- a/lib/resource-1.0/english/LangEng.gf
+++ b/lib/resource-1.0/english/LangEng.gf
@@ -1,19 +1,7 @@
 --# -path=.:../abstract:../common:prelude
 
 concrete LangEng of Lang = 
-  NounEng, 
-  VerbEng, 
-  AdjectiveEng,
-  AdverbEng,
-  NumeralEng,
-  SentenceEng,
-  QuestionEng,
-  RelativeEng,
-  ConjunctionEng,
-  PhraseEng,
-  TextX,
-  StructuralEng,
-  IdiomEng,
+  GrammarEng,
   LexiconEng
   ** {
 
diff --git a/lib/resource-1.0/finnish/LangFin.gf b/lib/resource-1.0/finnish/LangFin.gf
index 9f51710ce..3cd551a18 100644
--- a/lib/resource-1.0/finnish/LangFin.gf
+++ b/lib/resource-1.0/finnish/LangFin.gf
@@ -1,19 +1,7 @@
 --# -path=.:../abstract:../common:prelude
 
 concrete LangFin of Lang = 
-  NounFin, 
-  VerbFin, 
-  AdjectiveFin,
-  AdverbFin,
-  NumeralFin,
-  SentenceFin,
-  QuestionFin,
-  RelativeFin,
-  ConjunctionFin,
-  PhraseFin,
-  TextX,
-  IdiomFin,
-  StructuralFin,
+  GrammarFin,
   LexiconFin
   ** {
 
diff --git a/lib/resource-1.0/french/LangFre.gf b/lib/resource-1.0/french/LangFre.gf
index 50533cd29..6070e2634 100644
--- a/lib/resource-1.0/french/LangFre.gf
+++ b/lib/resource-1.0/french/LangFre.gf
@@ -1,19 +1,7 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
 concrete LangFre of Lang = 
-  NounFre, 
-  VerbFre, 
-  AdjectiveFre,
-  AdverbFre,
-  NumeralFre,
-  SentenceFre,
-  QuestionFre,
-  RelativeFre,
-  ConjunctionFre,
-  PhraseFre,
-  TextX,
-  IdiomFre,
-  StructuralFre,
+  GrammarFre,
   LexiconFre
   ** {
 
diff --git a/lib/resource-1.0/german/LangGer.gf b/lib/resource-1.0/german/LangGer.gf
index eb0bb9541..85b89e55b 100644
--- a/lib/resource-1.0/german/LangGer.gf
+++ b/lib/resource-1.0/german/LangGer.gf
@@ -1,19 +1,7 @@
 --# -path=.:../abstract:../common:prelude
 
 concrete LangGer of Lang = 
-  NounGer, 
-  VerbGer, 
-  AdjectiveGer,
-  AdverbGer,
-  NumeralGer,
-  SentenceGer,
-  QuestionGer,
-  RelativeGer,
-  ConjunctionGer,
-  PhraseGer,
-  TextX,
-  IdiomGer,
-  StructuralGer,
+  GrammarGer,
   LexiconGer
   ** {
 
diff --git a/lib/resource-1.0/italian/LangIta.gf b/lib/resource-1.0/italian/LangIta.gf
index b08d64184..d5e4670c7 100644
--- a/lib/resource-1.0/italian/LangIta.gf
+++ b/lib/resource-1.0/italian/LangIta.gf
@@ -1,19 +1,7 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
 concrete LangIta of Lang = 
-  NounIta, 
-  VerbIta, 
-  AdjectiveIta,
-  AdverbIta,
-  NumeralIta,
-  SentenceIta,
-  QuestionIta,
-  RelativeIta,
-  ConjunctionIta,
-  PhraseIta,
-  TextX,
-  IdiomIta,
-  StructuralIta,
+  GrammarIta,
   LexiconIta
   ** {
 
diff --git a/lib/resource-1.0/norwegian/LangNor.gf b/lib/resource-1.0/norwegian/LangNor.gf
index d9699c2d7..41d51c2a9 100644
--- a/lib/resource-1.0/norwegian/LangNor.gf
+++ b/lib/resource-1.0/norwegian/LangNor.gf
@@ -1,19 +1,7 @@
 --# -path=.:../scandinavian:../abstract:../common:prelude
 
 concrete LangNor of Lang = 
-  NounNor, 
-  VerbNor, 
-  AdjectiveNor,
-  AdverbNor,
-  NumeralNor,
-  SentenceNor,
-  QuestionNor,
-  RelativeNor,
-  ConjunctionNor,
-  PhraseNor,
-  TextX,
-  IdiomNor,
-  StructuralNor,
+  GrammarNor,
   LexiconNor
   ** {
 
diff --git a/lib/resource-1.0/russian/LangRus.gf b/lib/resource-1.0/russian/LangRus.gf
index a91740233..0556d605d 100644
--- a/lib/resource-1.0/russian/LangRus.gf
+++ b/lib/resource-1.0/russian/LangRus.gf
@@ -1,17 +1,9 @@
 --# -path=.:../abstract:../common:../../prelude
 
 concrete LangRus of Lang = 
-  NounRus, 
-  VerbRus, 
-  AdjectiveRus,
-  AdverbRus,
-  NumeralRus,
-  SentenceRus,
-  QuestionRus,
-  RelativeRus,
-  ConjunctionRus,
-  PhraseRus,
-  TextX,
-  StructuralRus,
-  IdiomRus,
-  LexiconRus ** { flags  startcat = Phr ; unlexer = text ; lexer = text ;} ;
+  GrammarRus,
+  LexiconRus ** {
+
+   flags startcat = Phr ; unlexer = text ; lexer = text ;
+
+  } ;
diff --git a/lib/resource-1.0/spanish/LangSpa.gf b/lib/resource-1.0/spanish/LangSpa.gf
index 951cab43d..ca4248e27 100644
--- a/lib/resource-1.0/spanish/LangSpa.gf
+++ b/lib/resource-1.0/spanish/LangSpa.gf
@@ -1,19 +1,7 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
 concrete LangSpa of Lang = 
-  NounSpa, 
-  VerbSpa, 
-  AdjectiveSpa,
-  AdverbSpa,
-  NumeralSpa,
-  SentenceSpa,
-  QuestionSpa,
-  RelativeSpa,
-  ConjunctionSpa,
-  PhraseSpa,
-  TextSpa,      -- special punctuation
-  IdiomSpa,
-  StructuralSpa,
+  GrammarSpa,
   LexiconSpa
   ** {
 
diff --git a/lib/resource-1.0/swedish/LangSwe.gf b/lib/resource-1.0/swedish/LangSwe.gf
index 9ebab4cc1..a321acd1f 100644
--- a/lib/resource-1.0/swedish/LangSwe.gf
+++ b/lib/resource-1.0/swedish/LangSwe.gf
@@ -1,19 +1,7 @@
 --# -path=.:../scandinavian:../abstract:../common:prelude
 
 concrete LangSwe of Lang = 
-  NounSwe, 
-  VerbSwe, 
-  AdjectiveSwe,
-  AdverbSwe,
-  NumeralSwe,
-  SentenceSwe,
-  QuestionSwe,
-  RelativeSwe,
-  ConjunctionSwe,
-  PhraseSwe,
-  TextX,
-  IdiomSwe,
-  StructuralSwe,
+  GrammarSwe,
   LexiconSwe
   ** {
 
diff --git a/src/GF/Conversion/GFC.hs b/src/GF/Conversion/GFC.hs
index 05a0e7683..2fff4be26 100644
--- a/src/GF/Conversion/GFC.hs
+++ b/src/GF/Conversion/GFC.hs
@@ -32,7 +32,7 @@ import qualified GF.Conversion.RemoveErasing as RemEra
 import qualified GF.Conversion.RemoveEpsilon as RemEps
 import qualified GF.Conversion.SimpleToMCFG as S2M
 import qualified GF.Conversion.SimpleToFCFG as S2FM
-import qualified GF.Conversion.MCFGtoFCFG as M2FM
+--import qualified GF.Conversion.MCFGtoFCFG as M2FM
 import qualified GF.Conversion.MCFGtoCFG as M2C
 
 import GF.Infra.Print
@@ -58,7 +58,7 @@ convertGFC opts = \g -> let s = g2s g
 		  Just "epsilon"           -> epsilon . nondet
 		  _                        -> nondet
 	  s2fm= S2FM.convertGrammar
-          m2fm= M2FM.convertGrammar
+          m2fm= undefined --M2FM.convertGrammar
 	  g2s = case getOptVal opts gfcConversion of
 		  Just "finite"            -> finite . simple
 		  Just "finite2"           -> finite . finite . simple
@@ -95,7 +95,7 @@ gfc2fcfg opts g = fcfg
     (_, fcfg, _) = snd (snd (convertGFC opts g))
 
 mcfg2fcfg :: MGrammar -> FGrammar
-mcfg2fcfg = M2FM.convertGrammar
+mcfg2fcfg = undefined --M2FM.convertGrammar
 
 
 ----------------------------------------------------------------------