merge cleanups