Premerge cleanup