cleanup based on new comps