Cleanup after merge.
Cleanup.