Work on cleaning up audio models [ci skip]