more audio cleanup

Change-Id: Ic4099d012522c35cf137c3d38ac5fd80f32b30cc