more cleaning and putzing

Change-Id: Ic78c923fc5673a7443175ac37f28f7f94d52fd02
more cleaning and putzing

Change-Id: I272fdf96678fb45002d798670d47a110c29a6e2b