cleanup merge chaff