compo cleanups continued