Major cleanup

Change-Id: I6ee795069866762be71aa947238033a31c77534a