Cleaning up for merge.