first pass clean up, not yet to_normal_form