Housecleaning

Change-Id: I1820d1daf7bad624f7feb4795805418ac90f2e1f