Audio code cleanups