little clean up

Change-Id: I92fe9679d82b41eeecc85be7e6feb0faea21fa66