more cleanups

Change-Id: I84faf85d33801bf18f04fae3a1ea04a1d330600b