diff --git a/src/classify/classify.cpp b/src/classify/classify.cpp
index 1cd476c8..01495e96 100644
--- a/src/classify/classify.cpp
+++ b/src/classify/classify.cpp
@@ -60,10 +60,8 @@ namespace tesseract {
 Classify::Classify()
     : BOOL_MEMBER(allow_blob_division, true, "Use divisible blobs chopping",
                   this->params()),
-      BOOL_MEMBER(prioritize_division, FALSE,
+      BOOL_MEMBER(prioritize_division, false,
                   "Prioritize blob division over chopping", this->params()),
-      INT_MEMBER(tessedit_single_match, FALSE, "Top choice only from CP",
-                 this->params()),
       BOOL_MEMBER(classify_enable_learning, true, "Enable adaptive classifier",
                   this->params()),
       INT_MEMBER(classify_debug_level, 0, "Classify debug level",
@@ -149,7 +147,7 @@ Classify::Classify()
       INT_MEMBER(classify_adapt_feature_threshold, 230,
                  "Threshold for good features during adaptive 0-255",
                  this->params()),
-      BOOL_MEMBER(disable_character_fragments, TRUE,
+      BOOL_MEMBER(disable_character_fragments, true,
                   "Do not include character fragments in the"
                   " results of the classifier",
                   this->params()),
@@ -158,10 +156,10 @@ Classify::Classify()
                     "Exclude fragments that do not look like whole"
                     " characters from training and adaption",
                     this->params()),
-      BOOL_MEMBER(classify_debug_character_fragments, FALSE,
+      BOOL_MEMBER(classify_debug_character_fragments, false,
                   "Bring up graphical debugging windows for fragments training",
                   this->params()),
-      BOOL_MEMBER(matcher_debug_separate_windows, FALSE,
+      BOOL_MEMBER(matcher_debug_separate_windows, false,
                   "Use two different windows for debugging the matching: "
                   "One for the protos and one for the features.",
                   this->params()),
diff --git a/src/classify/classify.h b/src/classify/classify.h
index e9b075a1..0ba262d0 100644
--- a/src/classify/classify.h
+++ b/src/classify/classify.h
@@ -424,9 +424,8 @@ class Classify : public CCStruct {
   // Set during training (in lang.config) to indicate whether the divisible
   // blobs chopper should be used in preference to chopping. Set to true for
   // southern Indic scripts.
-  BOOL_VAR_H(prioritize_division, FALSE,
+  BOOL_VAR_H(prioritize_division, false,
              "Prioritize blob division over chopping");
-  INT_VAR_H(tessedit_single_match, FALSE, "Top choice only from CP");
   BOOL_VAR_H(classify_enable_learning, true, "Enable adaptive classifier");
   INT_VAR_H(classify_debug_level, 0, "Classify debug level");
 
@@ -486,15 +485,15 @@ class Classify : public CCStruct {
             "Threshold for good protos during adaptive 0-255");
   INT_VAR_H(classify_adapt_feature_threshold, 230,
             "Threshold for good features during adaptive 0-255");
-  BOOL_VAR_H(disable_character_fragments, TRUE,
+  BOOL_VAR_H(disable_character_fragments, true,
              "Do not include character fragments in the"
              " results of the classifier");
   double_VAR_H(classify_character_fragments_garbage_certainty_threshold, -3.0,
                "Exclude fragments that do not match any whole character"
                " with at least this certainty");
-  BOOL_VAR_H(classify_debug_character_fragments, FALSE,
+  BOOL_VAR_H(classify_debug_character_fragments, false,
              "Bring up graphical debugging windows for fragments training");
-  BOOL_VAR_H(matcher_debug_separate_windows, FALSE,
+  BOOL_VAR_H(matcher_debug_separate_windows, false,
              "Use two different windows for debugging the matching: "
              "One for the protos and one for the features.");
   STRING_VAR_H(classify_learn_debug_str, "", "Class str to debug learning");
diff --git a/tessdata/configs/box.train b/tessdata/configs/box.train
index 03cf5632..f1836cff 100644
--- a/tessdata/configs/box.train
+++ b/tessdata/configs/box.train
@@ -1,7 +1,6 @@
 disable_character_fragments T
 file_type                   .bl
 textord_fast_pitch_test	T
-tessedit_single_match	0
 tessedit_zero_rejection T
 tessedit_minimal_rejection F
 tessedit_write_rep_codes F
diff --git a/tessdata/configs/box.train.stderr b/tessdata/configs/box.train.stderr
index d44ff2b2..a5bd4bd0 100644
--- a/tessdata/configs/box.train.stderr
+++ b/tessdata/configs/box.train.stderr
@@ -1,7 +1,6 @@
 file_type .bl
 #tessedit_use_nn F
 textord_fast_pitch_test T
-tessedit_single_match 0
 tessedit_zero_rejection T
 tessedit_minimal_rejection F
 tessedit_write_rep_codes F
diff --git a/tessdata/configs/lstm.train b/tessdata/configs/lstm.train
index 3cb172d5..9fa52007 100644
--- a/tessdata/configs/lstm.train
+++ b/tessdata/configs/lstm.train
@@ -1,7 +1,6 @@
 disable_character_fragments T
 file_type                   .bl
 textord_fast_pitch_test	T
-tessedit_single_match	0
 tessedit_zero_rejection T
 tessedit_minimal_rejection F
 tessedit_write_rep_codes F