Dead code now?