Minor cleanup

Change-Id: I6b59586b4fda5b63caa986940d553f792daa4af4