MAJOR house cleaning!

Change-Id: I2898e472ab1391094c2e856c87261f4560deda0c