delete the old stuff

Change-Id: I7306e00f026b0952ab193d61a40d0155b4e32e51