more cleanups

Change-Id: I7c6227bd32e0d051fa5416e570d8243277ae76d8