More cleanup
Migration to audio instead of switches