Cleaning up after the merge