Audio/ comment cleanup