Major cleanup

Change-Id: Id1707085c51e3d8aaef231fa37476a033781a2e9