Dead code

Change-Id: I05ecb627119eb545d1781fa42613e940fc22aac1