Dead code

Change-Id: I08bd15316e7952d05b769326c0a8a1d3493b0eb8