Clean up and merge.