Massive cleanup and update

Change-Id: Icca455458ff110a822586b6cde21572b693e0990