remove superfluous parser states
remove deprecated functions