Merge "Remove more dead audio service code"