Revert "Legacy Audio adds"

This reverts commit 32da402b3b73ce5aa51ffc1bc9e6d2b730e1ebf3

Change-Id: I6e417a68f1072ccf805cfd16a35599cd511ac216