diff --git a/src/hb-ot-shape-complex-private.hh b/src/hb-ot-shape-complex-private.hh
index 702e9522e..d3144857a 100644
--- a/src/hb-ot-shape-complex-private.hh
+++ b/src/hb-ot-shape-complex-private.hh
@@ -218,61 +218,9 @@ hb_ot_shape_complex_categorize (const hb_ot_shape_planner_t *planner)
 
     /* ^--- Add new shapers here */
 
-
 #if 0
-    /* Note:
-     *
-     * These disabled scripts are listed in ucd/IndicSyllabicCategory.txt, but according
-     * to Martin Hosken and Jonathan Kew do not require complex shaping.
-     *
-     * TODO We should automate figuring out which scripts do not need complex shaping
-     *
-     * TODO We currently keep data for these scripts in our indic table.  Need to fix the
-     * generator to not do that.
-     */
-
-
-    /* Simple? */
-
-    /* Unicode-3.2 additions */
-    case HB_SCRIPT_BUHID:
-    case HB_SCRIPT_HANUNOO:
-
-    /* Unicode-5.1 additions */
-    case HB_SCRIPT_SAURASHTRA:
-
-    /* Unicode-6.0 additions */
-    case HB_SCRIPT_BATAK:
-    case HB_SCRIPT_BRAHMI:
-
-
-    /* Simple */
-
-    /* Unicode-1.1 additions */
-    /* These have their own shaper now. */
-    case HB_SCRIPT_LAO:
-    case HB_SCRIPT_THAI:
-
-    /* Unicode-3.2 additions */
-    case HB_SCRIPT_TAGALOG:
-    case HB_SCRIPT_TAGBANWA:
-
-    /* Unicode-4.0 additions */
-    case HB_SCRIPT_LIMBU:
-    case HB_SCRIPT_TAI_LE:
-
     /* Unicode-4.1 additions */
-    case HB_SCRIPT_KHAROSHTHI:
     case HB_SCRIPT_NEW_TAI_LUE:
-    case HB_SCRIPT_SYLOTI_NAGRI:
-
-    /* Unicode-5.1 additions */
-    case HB_SCRIPT_KAYAH_LI:
-
-    /* Unicode-5.2 additions */
-    case HB_SCRIPT_TAI_VIET:
-
-
 #endif
 
     /* Unicode-1.1 additions */
@@ -289,25 +237,8 @@ hb_ot_shape_complex_categorize (const hb_ot_shape_planner_t *planner)
     /* Unicode-3.0 additions */
     case HB_SCRIPT_SINHALA:
 
-    /* Unicode-5.0 additions */
-    case HB_SCRIPT_BALINESE:
-
-    /* Unicode-5.1 additions */
-    case HB_SCRIPT_LEPCHA:
-    case HB_SCRIPT_REJANG:
-    case HB_SCRIPT_SUNDANESE:
-
     /* Unicode-5.2 additions */
     case HB_SCRIPT_JAVANESE:
-    case HB_SCRIPT_KAITHI:
-    case HB_SCRIPT_MEETEI_MAYEK:
-
-    /* Unicode-6.0 additions */
-
-    /* Unicode-6.1 additions */
-    case HB_SCRIPT_CHAKMA:
-    case HB_SCRIPT_SHARADA:
-    case HB_SCRIPT_TAKRI:
 
       /* If the designer designed the font for the 'DFLT' script,
        * use the default shaper.  Otherwise, use the Indic shaper.
@@ -385,35 +316,35 @@ hb_ot_shape_complex_categorize (const hb_ot_shape_planner_t *planner)
     case HB_SCRIPT_TIFINAGH:
 
     /* Unicode-5.0 additions */
-    //case HB_SCRIPT_BALINESE:
+    case HB_SCRIPT_BALINESE:
     //case HB_SCRIPT_NKO:
     //case HB_SCRIPT_PHAGS_PA:
 
     /* Unicode-5.1 additions */
     //case HB_SCRIPT_CHAM:
     case HB_SCRIPT_KAYAH_LI:
-    //case HB_SCRIPT_LEPCHA:
-    //case HB_SCRIPT_REJANG:
+    case HB_SCRIPT_LEPCHA:
+    case HB_SCRIPT_REJANG:
     case HB_SCRIPT_SAURASHTRA:
-    //case HB_SCRIPT_SUNDANESE:
+    case HB_SCRIPT_SUNDANESE:
 
     /* Unicode-5.2 additions */
     case HB_SCRIPT_EGYPTIAN_HIEROGLYPHS:
     //case HB_SCRIPT_JAVANESE:
-    //case HB_SCRIPT_KAITHI:
-    //case HB_SCRIPT_MEETEI_MAYEK:
+    case HB_SCRIPT_KAITHI:
+    case HB_SCRIPT_MEETEI_MAYEK:
     //case HB_SCRIPT_TAI_THAM:
-    //case HB_SCRIPT_TAI_VIET:
+    case HB_SCRIPT_TAI_VIET:
 
     /* Unicode-6.0 additions */
-    //case HB_SCRIPT_BATAK:
+    case HB_SCRIPT_BATAK:
     case HB_SCRIPT_BRAHMI:
     //case HB_SCRIPT_MANDAIC:
 
     /* Unicode-6.1 additions */
-    //case HB_SCRIPT_CHAKMA:
-    //case HB_SCRIPT_SHARADA:
-    //case HB_SCRIPT_TAKRI:
+    case HB_SCRIPT_CHAKMA:
+    case HB_SCRIPT_SHARADA:
+    case HB_SCRIPT_TAKRI:
 
     /* Unicode-7.0 additions */
     case HB_SCRIPT_DUPLOYAN: