Removed some code from lexer. Parser is next.