Clean up mute/unmute logic