CLeanup merges