Cleanup after merge