Major cleanup

Change-Id: I1efab1a322fb0532118d9f9834ac405118ca8bab