Remove dead code

Change-Id: I92767025aff7ac7642d0eded75d3b1d0bd026f73