Major cleanup

Change-Id: I069d397298bdae38aaaf6b442efde375ff69d45e