more cleanup of sound-merge