Major cleanup

Change-Id: I85032333e302fbcedfc2a4629b23ddddf3c56b56