cleanup merge remnants