Merge cleanUp