Implement Mute, cleanup commented out stuff