Revert "Audio Optimization and housekeeping"

This reverts commit 6bd09d24c741a70fa62228db6eeef3391f3eab54.
Revert "Revert "Audio Optimization and housekeeping""

This reverts commit 1ba4859fcff65cf43245894f98d2d681962dfc57.