Major Cleanup

Change-Id: I2df768d6999af13db17247b0a57c88adae5a5847