Removed some old stuff

Change-Id: Ibb50598ef161c4a9679ab49fd1a80d0f7c752cee