Major Cleanup

Change-Id: I2e98e90c5fdb6b2807460dfb4371b650717f2b56