Dead code detected using the python "vulture" library. Change-Id: Iff415a1adcfde3f2a3858473b9fa8b3d87705e1f