Improved Lexer error reporting / Removed some depricated code