huge audio adjustment, and a pure clean out

Change-Id: Ia3299e8c8153f5d3f45682e5ff831d8b382688cd