diff --git a/src/io/io.f90 b/src/io/io.f90
index 2ecac13b0..27068aeb9 100644
--- a/src/io/io.f90
+++ b/src/io/io.f90
@@ -1401,6 +1401,10 @@ module subroutine io_read_in_system(self, param)
          allocate(tmp_param, source=param)
          tmp_param%outfile = param%in_netcdf
          tmp_param%out_form = param%in_form
+         if (.not. param%lrestart) then
+            ! Turn off energy computation so we don't have to feed it into the initial conditions
+            tmp_param%lenergy = .false.
+         end if
          ierr = self%read_frame(tmp_param%nciu, tmp_param)
          deallocate(tmp_param)
          if (ierr /=0) call util_exit(FAILURE)
diff --git a/src/modules/swiftest_classes.f90 b/src/modules/swiftest_classes.f90
index a86dc2312..1ef589770 100644
--- a/src/modules/swiftest_classes.f90
+++ b/src/modules/swiftest_classes.f90
@@ -1595,40 +1595,6 @@ module function util_solve_rkf45(f, y0in, t1, dt0, tol) result(y1)
       end function util_solve_rkf45
    end interface
 
-   interface
-      module recursive pure subroutine qsort_DP(arr, ind)
-         implicit none
-         ! Arguments
-         real(DP), dimension(:), intent(inout)           :: arr
-         integer(I4B),dimension(:),intent(out), optional :: ind
-      end subroutine qsort_DP
-
-      module recursive pure subroutine qsort_I4B(arr, ind)
-         implicit none
-         integer(I4B), dimension(:), intent(inout)          :: arr
-         integer(I4B), dimension(:), intent(out),  optional :: ind
-      end subroutine qsort_I4B
-
-      module recursive pure subroutine qsort_I4B_I8Bind(arr, ind)
-         implicit none
-         integer(I4B), dimension(:), intent(inout)          :: arr
-         integer(I8B), dimension(:), intent(out),  optional :: ind
-      end subroutine qsort_I4B_I8Bind
-
-      module recursive pure subroutine qsort_I8B_I8Bind(arr, ind)
-         implicit none
-         integer(I8B), dimension(:), intent(inout)          :: arr
-         integer(I8B), dimension(:), intent(out),  optional :: ind
-      end subroutine qsort_I8B_I8Bind
-
-      module recursive pure subroutine qsort_SP(arr, ind)
-         implicit none
-         real(SP), dimension(:), intent(inout)           :: arr
-         integer(I4B),dimension(:),intent(out), optional :: ind
-      end subroutine qsort_SP
-
-   end interface
-
    interface util_sort
       module pure subroutine util_sort_i4b(arr)
          implicit none