diff --git a/src/cff/cf2font.c b/src/cff/cf2font.c
index 22044c691..9e81f1c34 100644
--- a/src/cff/cf2font.c
+++ b/src/cff/cf2font.c
@@ -253,9 +253,6 @@
     CFF_VarData* varData;
     CF2_UInt master;
 
-    FT_UNUSED( lenNormalizedVector );
-    FT_UNUSED( vsindex );
-
     FT_ASSERT( lenBlendVector && blendVector );
     FT_ASSERT( lenNormalizedVector == 0 || normalizedVector );
     FT_TRACE4(( "cf2_buildBlendVector\n" ));
diff --git a/src/cff/cf2ft.c b/src/cff/cf2ft.c
index 93c538313..e13e0905e 100644
--- a/src/cff/cf2ft.c
+++ b/src/cff/cf2ft.c
@@ -425,8 +425,7 @@
     return &decoder->cff->vstore;
   }
 
-  /* get maxstack value from CFF2 Top DICT                         */
-  /* Note: CFF2 Font DICT contains only the default maxstack value */
+  /* get maxstack value from CFF2 Top DICT */
   FT_LOCAL_DEF ( FT_UInt )
   cf2_getMaxstack( CFF_Decoder* decoder )
   {
diff --git a/src/cff/cf2intrp.c b/src/cff/cf2intrp.c
index 06afe7ed1..60e62df43 100644
--- a/src/cff/cf2intrp.c
+++ b/src/cff/cf2intrp.c
@@ -562,7 +562,7 @@
      */
 
     /* allocate an operand stack */
-    stackSize = font->isCFF2 ? cf2_getMaxstack( decoder ) : 
+    stackSize = font->isCFF2 ? cf2_getMaxstack( decoder ) :
                                CF2_OPERAND_STACK_SIZE;
     opStack = cf2_stack_init( memory, error, stackSize );
     if ( !opStack )
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 6a58de826..61c359486 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -1328,9 +1328,6 @@ Exit:
     CFF_VarData* varData;
     FT_UInt master;
 
-    FT_UNUSED( lenNDV );
-    FT_UNUSED( vsindex );
-
     FT_ASSERT( lenNDV == 0 || NDV );
 
     blend->builtBV = FALSE;