(merger) some cleanup