del unused lines and files

Change-Id: I910964ef5fb287bdcc3071f3f09f83364a049e10