clean up

Change-Id: Ic0c13d4596457872fe6943298b3a943cfcaeade5