Remove dead code

Change-Id: I1edce9e336650cc3317de8883e08fb6536c58c70