Cleanup merge.
Cleanup.