Cleaning up after merge.