diff --git a/src/LegendSpecFits.jl b/src/LegendSpecFits.jl
index 6e7a3ed7..398096c6 100644
--- a/src/LegendSpecFits.jl
+++ b/src/LegendSpecFits.jl
@@ -21,14 +21,10 @@ using ForwardDiff
 using IntervalSets
 using InverseFunctions
 using IrrationalConstants
-using LineSearches
-using LinearRegression
-using LineSearches
 using LsqFit
 using Measurements
 using Measurements: value as mvalue
 using Measurements: uncertainty as muncert
-using Optim
 using Optimization
 using OptimizationBBO
 using OptimizationNLopt
diff --git a/src/memory_utils.jl b/src/memory_utils.jl
index f4eeebdb..182dd53a 100644
--- a/src/memory_utils.jl
+++ b/src/memory_utils.jl
@@ -41,18 +41,18 @@ function advanced_time_and_memory_control( ; start_time::Float64=time(), start_m
     if mem_limit < 0
         mem_limit = optim_max_mem
     end
-    function callback(x::Optim.OptimizationState)
+    function callback(x::Optimization.OptimizationState)
         # @debug " * Iteration:       $(x.iteration)"
         so_far =  time() - start_time
         # @debug " * Time so far:     $so_far"
-        if x.iteration == 0
+        if x.iter == 0
             time_to_setup .= time() - start_time
             return false
         elseif Sys.maxrss()/2^30 - start_mem > mem_limit
             @warn " * Memory limit reached"
             return true
         else
-            expected_next_time = so_far + (time() - start_time - time_to_setup[1])/(x.iteration)
+            expected_next_time = so_far + (time() - start_time - time_to_setup[1])/(x.iter)
             # @debug " * Next iteration ≈ $expected_next_time"
             # @debug " * Time limit:      $time_limit"
             # @debug " * Start limit:     $start_time"