Basic cleanup and bulid fixes

Change-Id: Ib0c02d1535020f77c0097c027d88ce212272c2b3