diff --git a/CMakeLists.txt b/CMakeLists.txt
index efecbc4d3..776f386e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,9 @@ SET(VERSION 1.0.0)
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 # Uncomment if it is required that Fortran 90 is supported
-#IF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
-#    MESSAGE(FATAL_ERROR "Fortran compiler does not support F90")
-#ENDIF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
+IF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
+    MESSAGE(FATAL_ERROR "Fortran compiler does not support F90")
+ENDIF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90)
 
 # Set some options the user may choose
 # Uncomment the below if you want the user to choose a parallelization library
diff --git a/cmake/Modules/SetFortranFlags.cmake b/cmake/Modules/SetFortranFlags.cmake
index a8c1121e7..9d3e6bfb0 100644
--- a/cmake/Modules/SetFortranFlags.cmake
+++ b/cmake/Modules/SetFortranFlags.cmake
@@ -63,7 +63,7 @@ ELSE()
 ENDIF()
 # Optimize for the host's architecture
 SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}"
-                 Fortran "-xHost"        # Intel
+                 Fortran "-xhost"        # Intel
                          "/QxHost"       # Intel Windows
                          ${GNUNATIVE}    # GNU
                          "-ta=host"      # Portland Group
@@ -244,13 +244,6 @@ SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
                          "/Qip" # Intel Windows
                 )
 
-# Vectorize code
-SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
-                 Fortran "-vec-report0"  # Intel
-                         "/Qvec-report0" # Intel Windows
-                         "-Mvect"        # Portland Group
-                )
-
 # Allows for lines longer than 80 characters without truncation
 SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
                  Fortran "-no-wrap-margin"         # Intel
@@ -277,11 +270,6 @@ SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
                  Fortran "-simd" # Intel
                 )
 
-# Generate instructions for the highest instruction set available
-SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
-                 Fortran "-xhost" # Intel
-                )
-
 # Aligns a variable to a specified boundary and offset
 SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}"
                  Fortran "-align all" # Intel
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e0bc0750b..24b545ea2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,7 +43,6 @@ SET(FOO_src ${SRC}/discard/discard.f90
             ${SRC}/operators/operator_cross.f90
             ${SRC}/operators/operator_mag.f90
             ${SRC}/orbel/orbel.f90
-#            ${SRC}/python_bindings/orbel.f90
             ${SRC}/rmvs/rmvs_discard.f90
             ${SRC}/rmvs/rmvs_encounter_check.f90
             ${SRC}/rmvs/rmvs_io.f90
@@ -62,8 +61,6 @@ SET(FOO_src ${SRC}/discard/discard.f90
             ${SRC}/symba/symba_setup.f90
             ${SRC}/symba/symba_step.f90
             ${SRC}/symba/symba_util.f90
-#            ${SRC}/tides/tides_getacch_pl.f90
-#            ${SRC}/tides/tides_spin_step.f90
             ${SRC}/user/user_getacch.f90
             ${SRC}/util/util_append.f90
             ${SRC}/util/util_coord.f90
diff --git a/src/python_bindings/orbel.f90 b/src/python_bindings/orbel.f90
deleted file mode 100644
index 59f24e8b2..000000000
--- a/src/python_bindings/orbel.f90
+++ /dev/null
@@ -1,32 +0,0 @@
-module orbel
-    use swiftest
-    private
-    public :: xv2el
-contains
-    pure elemental subroutine xv2el(mu, px, py, pz, vx, vy, vz, a, e, inc, capom, omega, capm)
-        use swiftest_classes, only : orbel_xv2el
-        implicit none
-        ! Arguments
-        real*8, intent(in) :: mu, px, py, pz, vx, vy, vz
-        real*8, intent(out) :: a, e, inc, capom, omega, capm
-        !$f2py intent(in) mu
-        !$f2py intent(in) px
-        !$f2py intent(in) py
-        !$f2py intent(in) pz
-        !$f2py intent(in) vx
-        !$f2py intent(in) vy
-        !$f2py intent(in) vz
-        !$f2py intent(out) a
-        !$f2py intent(out) e
-        !$f2py intent(out) inc
-        !$f2py intent(out) capom
-        !$f2py intent(out) omega
-        !$f2py intent(out) capm
-        ! Internals
-        real*8, dimension(3) :: x, v
-        x = [px, py, pz]
-        v = [vx, vy, vz]
-        call orbel_xv2el(mu, x(:), v(:), a, e, inc, capom, omega, capm)
-        return
-    end subroutine xv2el
-end module orbel
\ No newline at end of file