Merge cleanup
Nearing completion.