something something cleanups

Change-Id: I2d90503d8378f7ac85344c9abaf0b3c925c63709