Cleanup before merge.