Audio: remove more code that'll be replaced