Delete stuff not needed

Change-Id: I4dd0a093a9539093b008cd7a20d4534d99eeb3d6