Major revision/cleanout.

Change-Id: Ia8448c562b68598c4ead6f53b254ea2219c7144f