Major cleanup

Change-Id: I900f83ab70d7aaf9c554c1716dc731f181996055