Cleanup various parts of lexer