Begin cleanup

Change-Id: Ia391102bc46bda9ef3a748e4861f8d0817dbe0f4