diff --git a/Makefile.Defines b/Makefile.Defines
index 70069bb71..291f2c604 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -65,13 +65,13 @@ GPAR = -fopenmp -ftree-parallelize-loops=4
 GMEM = -fsanitize=undefined -fsanitize=address -fsanitize=leak 
 GWARNINGS = -Wall -Warray-bounds  -Wimplicit-interface -Wextra -Warray-temporaries
 
-#FFLAGS  = $(IDEBUG) $(HEAPARR)
+FFLAGS  = $(IDEBUG) $(HEAPARR)
 #FFLAGS  = -init=snan,arrays -no-wrap-margin -O3 $(STRICTREAL) $(SIMDVEC) $(PAR) 
-#FORTRAN = ifort
+FORTRAN = ifort
 #AR     = xiar
 
-FORTRAN = gfortran
-FFLAGS =  -ffree-line-length-none $(GDEBUG) $(GMEM)
+#FORTRAN = gfortran
+#FFLAGS =  -ffree-line-length-none $(GDEBUG) $(GMEM)
 AR     = ar
 
 # DO NOT include in CFLAGS the "-c" option to compile object only
diff --git a/src/util/util_solve.f90 b/src/util/util_solve.f90
index ed9ff40ea..057ed1182 100644
--- a/src/util/util_solve.f90
+++ b/src/util/util_solve.f90
@@ -51,7 +51,6 @@ module function util_solve_linear_system_q(A,b,n,lerr) result(x)
       !! Uses Gaussian elimination, so will have issues if system is ill-conditioned.
       !! Uses quad precision intermidiate values, so works best on small arrays.
       use, intrinsic :: ieee_exceptions
-      use swiftest
       implicit none
       ! Arguments
       integer(I4B),             intent(in) :: n