Cleaning up and merging