diff --git a/src/autofit/afadjust.c b/src/autofit/afadjust.c
index 7c684be3e..d1fea63cc 100644
--- a/src/autofit/afadjust.c
+++ b/src/autofit/afadjust.c
@@ -21,7 +21,7 @@
 FT_LOCAL_ARRAY_DEF( AF_AdjustmentDatabaseEntry )
 adjustment_database[] =
 {
-    {0x21,  AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP}, /* ! *
+    {0x21,  AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP}, /* ! */
     {0x69,  AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP}, /* i */
     {0x6A,  AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP}, /* j */
     {0xA1,  AF_VERTICAL_ADJUSTMENT_TOP_CONTOUR_UP}, /*Inverted Exclamation Mark*/
@@ -417,7 +417,6 @@ af_reverse_character_map_new( AF_ReverseCharacterMap *map, AF_FaceGlobals global
         FT_Long index = ( *map )->length++;
         ( *map )->entries[index].glyph_index = output_glyph_index;
         ( *map )->entries[index].codepoint = input_codepoint;
-        FT_TRACE4(("Adding entry: %d -> %d\n", output_glyph_index, input_codepoint));
 
         end: ;
     }
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index ce5da7feb..a88ec6cc0 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -2820,7 +2820,6 @@ af_remove_segments_containing_point(AF_GlyphHints hints, AF_Point point)
 
     if ( remove )
     {
-      FT_TRACE4(("Removing segment %d\n", i));
       /* first, check the first and last fields of the edge */
       AF_Edge edge = seg->edge;
       if ( edge->first == seg && edge->last == seg )
@@ -2989,8 +2988,6 @@ af_latin_stretch_tildes( AF_GlyphHints hints,
     }
     while ( p != first_point );
 
-    FT_TRACE4(( "af_latin_stretch_tildes: Height: %d, measurement: %d, measurements taken: %d\n", height, min_measurement, measurements_taken ));
-
     FT_Pos new_min_y, new_max_y;
     new_min_y = new_max_y = first_point->y;
     p = first_point;
@@ -3006,8 +3003,6 @@ af_latin_stretch_tildes( AF_GlyphHints hints,
       }
     }
     while ( p != first_point );
-
-    FT_TRACE4(( "af_latin_stretch_tildes: New height: %d\n, miny: %d, maxy: %d", new_max_y - new_min_y, new_min_y, new_max_y));
   }
 }