Clean up
Merges