Audio fixes, remove unused audio stuff and some cleanup