Clean up and merge