diff --git a/include/config.h b/include/config.h
index 41bb5468..270f347d 100644
--- a/include/config.h
+++ b/include/config.h
@@ -68,18 +68,6 @@
 //#define TIME_STAT
 //#define CYCLE_STAT
 
-//#define EVALUATE_ENABLE
-
-#ifdef EVALUATE_ENABLE
-//#define EVALUATE_MATERIAL
-//#define EVALUATE_SPACE
-#define EVALUATE_MOBILITY
-//#define EVALUATE_TEMPO
-//#define EVALUATE_THREAT
-//#define EVALUATE_SHAPE
-//#define EVALUATE_MOTIF
-#endif /* EVALUATE_ENABLE */
-
 #define SORT_MOVE_WITH_HUMAN_KNOWLEDGES
 
 #define TRANSPOSITION_TABLE_ENABLE
diff --git a/src/evaluate.h b/src/evaluate.h
index 5e871d40..3e2d8bcd 100644
--- a/src/evaluate.h
+++ b/src/evaluate.h
@@ -34,57 +34,6 @@ std::string trace(Position *pos);
 
 Value evaluate(Position *pos);
 
-#ifdef EVALUATE_ENABLE
-
-#ifdef EVALUATE_MATERIAL
-    Value evaluateMaterial()
-    {
-        return 0;
-    }
-#endif
-
-#ifdef EVALUATE_SPACE
-    Value evaluateSpace()
-    {
-        return 0;
-    }
-#endif
-
-#ifdef EVALUATE_MOBILITY
-    Value evaluateMobility()
-    {
-        return 0;
-    }
-#endif
-
-#ifdef EVALUATE_TEMPO
-    Value evaluateTempo()
-    {
-        return 0;
-    }
-#endif
-
-#ifdef EVALUATE_THREAT
-    Value evaluateThreat()
-    {
-        return 0;
-    }
-#endif
-
-#ifdef EVALUATE_SHAPE
-    Value evaluateShape()
-    {
-        return 0;
-    }
-#endif
-
-#ifdef EVALUATE_MOTIF
-    Value AIAlgorithm::evaluateMotif()
-    {
-        return 0;
-    }
-#endif
-#endif /* EVALUATE_ENABLE */
 };
 
 #endif /* EVALUATE_H */
diff --git a/src/search.h b/src/search.h
index 2c0c87b5..0102f28a 100644
--- a/src/search.h
+++ b/src/search.h
@@ -182,32 +182,6 @@ public:
 
 public: /* TODO: Move to private or protected */
 
-#ifdef EVALUATE_ENABLE
-    Value evaluate();
-
-#ifdef EVALUATE_MATERIAL
-    Value evaluateMaterial();
-#endif
-#ifdef EVALUATE_SPACE
-    Value evaluateSpace();
-#endif
-#ifdef EVALUATE_MOBILITY
-    Value evaluateMobility();
-#endif
-#ifdef EVALUATE_TEMPO
-    Value evaluateTempo();
-#endif
-#ifdef EVALUATE_THREAT
-    Value evaluateThreat();
-#endif
-#ifdef EVALUATE_SHAPE
-    Value evaluateShape();
-#endif
-#ifdef EVALUATE_MOTIF
-    Value evaluateMotif();
-#endif
-#endif /* EVALUATE_ENABLE */
-
     Value search(Depth depth, Value alpha, Value beta);
 
     Value MTDF(Value firstguess, Depth depth);