Merge the cleanup