Dead code removed
Fixed