more clean-up

Change-Id: I63ddc71825ce8127c764c57d5435c3b5bcee6725