Removed getTokenType() and isTokenType()
Cleanup