more cleanup work.  Hi ho, hi ho