Cleanup before merging