audio code cleanup