Major cleanup

Change-Id: I47eaa89131dfb4c18013bc35b3d67609a124ea58