Clean up

Change-Id: I70c0d242597116e20aaee824cbb86e1020143fc9