CleanUp after remerge