Revert "Legacy Audio adds"

This reverts commit e9d265f0849f7238201e84b62d27c67cb597255d

Change-Id: I3e21baa7e0d4472a5e6401342081fd05bb9da681