cleanups

Change-Id: I9dfd0a1fd3fbf813afe1ed724d464ba8edc24115