Remove obsolete stuff

Change-Id: Idd1d4fc8d67281241f45519e71c3ee1be78a4623