Clean up
fix build
Bring back new audio