More audio item cleanup and improvement.