diff --git a/brut.apktool.smali/smali/src/main/antlr3/smaliParser.g b/brut.apktool.smali/smali/src/main/antlr3/smaliParser.g
index 563cda36..db68e026 100644
--- a/brut.apktool.smali/smali/src/main/antlr3/smaliParser.g
+++ b/brut.apktool.smali/smali/src/main/antlr3/smaliParser.g
@@ -41,17 +41,6 @@ tokens {
   ARRAY_DATA_DIRECTIVE;
   ARRAY_DESCRIPTOR;
   ARROW;
-  BASE_ARRAY_DESCRIPTOR;
-  BASE_CHAR_LITERAL;
-  BASE_CLASS_DESCRIPTOR;
-  BASE_FLOAT;
-  BASE_FLOAT_OR_ID;
-  BASE_INTEGER;
-  BASE_PRIMITIVE_TYPE;
-  BASE_SIMPLE_NAME;
-  BASE_STRING_LITERAL;
-  BASE_TYPE;
-  BINARY_EXPONENT;
   BOOL_LITERAL;
   BYTE_LITERAL;
   CATCH_DIRECTIVE;
@@ -63,7 +52,6 @@ tokens {
   CLOSE_PAREN;
   COLON;
   COMMA;
-  DECIMAL_EXPONENT;
   DOTDOT;
   DOUBLE_LITERAL;
   DOUBLE_LITERAL_OR_ID;
@@ -79,14 +67,10 @@ tokens {
   ENUM_DIRECTIVE;
   EPILOGUE_DIRECTIVE;
   EQUAL;
-  ESCAPE_SEQUENCE;
   FIELD_DIRECTIVE;
   FIELD_OFFSET;
   FLOAT_LITERAL;
   FLOAT_LITERAL_OR_ID;
-  HEX_DIGIT;
-  HEX_DIGITS;
-  HEX_PREFIX;
   IMPLEMENTS_DIRECTIVE;
   INLINE_INDEX;
   INSTRUCTION_FORMAT10t;
@@ -133,7 +117,6 @@ tokens {
   INSTRUCTION_FORMAT3rmi_METHOD;
   INSTRUCTION_FORMAT3rms_METHOD;
   INSTRUCTION_FORMAT51l;
-  INVALID_TOKEN;
   LINE_COMMENT;
   LINE_DIRECTIVE;
   LOCAL_DIRECTIVE;
@@ -167,9 +150,9 @@ tokens {
   VTABLE_INDEX;
   WHITE_SPACE;
 
-  //A couple of generated types that we remap other tokens to, to simplify the generated AST
-  LABEL;
+  // misc non-lexer tokens
   INTEGER_LITERAL;
+  INVALID_TOKEN;
 
   //I_* tokens are imaginary tokens used as parent AST nodes
   I_CLASS_DEF;