parser cleanup