Dead code cleanup