Cleanup lexer old cruft