Cleanup preparing for merge.