parser cleanup before bigger refactoring