Cleaning pass

Change-Id: I8d5feb065c558f8f5b96594757b1e20dfc1a1077