delete some stuff

Change-Id: I9d453e5768e07619d7acab6d5db05529f7277394