Small cleanup

Change-Id: I0f38ea431d55a4c81fa055a03bc2147cc4a30916