golgote some cleanup, prepare for opm release