Remove commented out old code and comment audio stuff