[FIX] Dead code