Major cleanup

Change-Id: I29a3fd3ab24fb4ded2e4b7f2b44b53dac473d7d3