Delete old code

Change-Id: Ia72d33eccedc304777e74d1fad0ec8bc98b9390e