remove lots of states in the parser