Revert "Legacy Audio adds"

This reverts commit f396e99340722d868a7b030de6ab0dca3cabd1a1

Change-Id: Iddfb0c46944944855cf4d4a04b4638914d3c4fcc