Dead code

Change-Id: I50b13e27501dfd885e3ed99215d18166d5112bf7