Cleanup

Change-Id: Ib0e728a29eb327770a0f1ece2c15a8d410ac461e