Cleanup and merge