more clean-up

Change-Id: Ic2e70b824918e49da139cf0f091b4b62a823d652