Cleanup on merge