merge w/ upstream

1 files changed, 0 insertions, 11 deletions

diff --git a/decoder/cdec_ff.cc b/decoder/cdec_ff.cc
index a36a0f5f..d586c1d1 100644
--- a/decoder/cdec_ff.cc
+++ b/decoder/cdec_ff.cc
@@ -23,12 +23,8 @@
 #include "ff_register.h"
 #include "ff_charset.h"
 #include "ff_wordset.h"
-#include "ff_dwarf.h"
 #include "ff_external.h"
 
-#ifdef HAVE_GLC
-#include <cdec/ff_glc.h>
-#endif
 
 void register_feature_functions() {
   static bool registered = false;
@@ -45,9 +41,6 @@ void register_feature_functions() {
   RegisterFF<BLEUModel>();
 
   //TODO: use for all features the new Register which requires static FF::usage(false,false) give name
-#ifdef HAVE_RANDLM
-  ff_registry.Register("RandLM", new FFFactory<LanguageModelRandLM>);
-#endif
   ff_registry.Register("SpanFeatures", new FFFactory<SpanFeatures>());
   ff_registry.Register("NgramFeatures", new FFFactory<NgramDetector>());
   ff_registry.Register("RuleContextFeatures", new FFFactory<RuleContextFeatures>());
@@ -81,10 +74,6 @@ void register_feature_functions() {
   ff_registry.Register("WordPairFeatures", new FFFactory<WordPairFeatures>);
   ff_registry.Register("SourcePathFeatures", new FFFactory<SourcePathFeatures>);
   ff_registry.Register("WordSet", new FFFactory<WordSet>);
-  ff_registry.Register("Dwarf", new FFFactory<Dwarf>);
   ff_registry.Register("External", new FFFactory<ExternalFeature>);
-#ifdef HAVE_GLC
-  ff_registry.Register("ContextCRF", new FFFactory<Model1Features>);
-#endif
 }