Major cleanup

Change-Id: I05edac543372e4cc1fb23b03249d9035ad4a523e