minor cleanup

Change-Id: I18a784963047f9ed2f14a59e294e0e82f2ecb526
more cleanup

Change-Id: Id107dd36a5b1443740ccc676c7f432bdd910dc9d