Import handling removed from lexer