cleanups

Change-Id: I2cbfc62422a6a10132029bfef4c2dfd4a861e1fe