Merge and cleanup 1