Remove dead code

Change-Id: I0bbfdbdc7ef4674260771f15b9c2aa40c4bf5f36