more cleanup

Change-Id: I104fecdd30a4567a3f74a33cd0d266b11e76692a