Fix Audio Module and some deprecated code