Audio Module Clean Up First Pass