huge clean up part 2

Change-Id: Ied8070889dd095f630fb740da2d5ca1afa0317df