Removed debug attempts, reverted to old lexing