jump-dev
diff --git a/‎Project.toml
-2 b/‎Project.toml
-2
diff --git a/‎docs/src/manual/nlp.md
+1-1 b/‎docs/src/manual/nlp.md
+1-1
diff --git a/‎src/JuMP.jl
+3-41 b/‎src/JuMP.jl
+3-41
diff --git a/‎src/_Derivatives/_Derivatives.jl
-46 b/‎src/_Derivatives/_Derivatives.jl
-46
@@ -4,7 +4,6 @@ repo = "https://github.com/jump-dev/JuMP.jl.git"
 version = "1.0.0"
 
 [deps]
-Calculus = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -17,7 +16,6 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 
 [compat]
-Calculus = "0.5"
 DataStructures = "0.18"
 ForwardDiff = "~0.5.0, ~0.6, ~0.7, ~0.8, ~0.9, ~0.10"
 JSON = "0.21"
 
@@ -245,7 +245,7 @@ julia> @NLconstraint(model, *(x...) <= 1.0)
 x[1] * x[2] * x[3] - 1.0 ≤ 0
 
 julia> @NLconstraint(model, *((x / 2)...) <= 0.0)
-ERROR: LoadError: Unexpected expression in (*)(x / 2...). JuMP supports splatting only symbols. For example, x... is ok, but (x + 1)..., [x; y]... and g(f(y)...) are not.
+ERROR: Unsupported use of the splatting operator. JuMP supports splatting only symbols. For example, `x...` is ok, but `(x + 1)...`, `[x; y]...` and `g(f(y)...)` are not.
 ```
 
 ## User-defined Functions
 
@@ -46,19 +46,14 @@ Shorthand for the MathOptInterface.Bridges package.
 """
 const MOIB = MOI.Bridges
 
-import Calculus
 import OrderedCollections.OrderedDict
 import ForwardDiff
-include("Nonlinear/Nonlinear.jl")
-include("_Derivatives/_Derivatives.jl")
-using ._Derivatives
 
+include("Nonlinear/Nonlinear.jl")
 include("Containers/Containers.jl")
 
 # Exports are at the end of the file.
 
-include("utils.jl")
-
 const _MOIVAR = MOI.VariableIndex
 const _MOICON{F,S} = MOI.ConstraintIndex{F,S}
 
@@ -150,7 +145,7 @@ mutable struct Model <: AbstractModel
     # where kwargs get passed along to subsequent solve calls.
     optimize_hook::Any
     # TODO: Document.
-    nlp_data::Any
+    nlp_data::Union{Nothing,Nonlinear.NonlinearData}
     # Dictionary from variable and constraint names to objects.
     obj_dict::Dict{Symbol,Any}
     # Number of times we add large expressions. Incremented and checked by
@@ -595,15 +590,6 @@ Returns number of variables in `model`.
 """
 num_variables(model::Model)::Int64 = MOI.get(model, MOI.NumberOfVariables())
 
-"""
-    num_nonlinear_constraints(model::Model)
-
-Returns the number of nonlinear constraints associated with the `model`.
-"""
-function num_nonlinear_constraints(model::Model)
-    return model.nlp_data !== nothing ? length(model.nlp_data.nlconstr) : 0
-end
-
 """
     object_dictionary(model::Model)
 
@@ -1322,35 +1308,11 @@ function operator_warn(model::Model)
     end
 end
 
-"""
-    NonlinearExpression <: AbstractJuMPScalar
-
-A struct to represent a nonlinear expression.
-
-Create an expression using [`@NLexpression`](@ref).
-"""
-struct NonlinearExpression <: AbstractJuMPScalar
-    model::Model
-    index::Int
-end
-
-"""
-    NonlinearParameter <: AbstractJuMPScalar
-
-A struct to represent a nonlinear parameter.
-
-Create a parameter using [`@NLparameter`](@ref).
-"""
-struct NonlinearParameter <: AbstractJuMPScalar
-    model::Model
-    index::Int
-end
-
 include("copy.jl")
+include("nlp.jl")
 include("operators.jl")
 include("macros.jl")
 include("optimizer_interface.jl")
-include("nlp.jl")
 include("print.jl")
 include("solution_summary.jl")
 include("lp_sensitivity2.jl")