minimal parser cleanup