lots of cleanup.  breaks m367_22