Small cleanup

Change-Id: I4a7082c524729ce6439991b81ee3de3a91ff151c