More sound cleanup