diff --git a/Makefile.Defines b/Makefile.Defines
index b9dc143fc..21d6d1a11 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -65,7 +65,7 @@ FORTRAN = ifort
 FFLAGS  = -init=snan,arrays -traceback -no-wrap-margin -O3 -g -shared-intel -debug inline-debug-info -qopt-report=5 $(SIMDVEC) $(STRICTREAL) $(PAR)
 
 
-GDEBUG = -ggdb -g3 -Og -fbacktrace -fbounds-check -fcheck=all -ffpe-trap=zero,invalid,overflow,underflow,denormal
+GDEBUG = -ggdb -g3 -Og -fbacktrace -fbounds-check 
 GPRODUCTION = -O3
 GPAR = -fopenmp -ftree-parallelize-loops=4
 GMEM = -fsanitize=undefined -fsanitize=address -fsanitize=leak 
diff --git a/examples/rmvs_swifter_comparison/mars_ejecta/advisor_script.sh b/examples/rmvs_swifter_comparison/mars_ejecta/advisor_script.sh
deleted file mode 100755
index 20382ff0f..000000000
--- a/examples/rmvs_swifter_comparison/mars_ejecta/advisor_script.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/apps/cent7/intel/advisor_2019.3.0.591490/bin64/advixe-cl -collect survey -module-filter-mode=exclude -mrte-mode=managed -interval=10 -data-limit=500 -stackwalk-mode=offline -stack-stitching -mkl-user-mode -no-profile-python -no-support-multi-isa-binaries -no-spill-analysis -no-static-instruction-mix -auto-finalize -project-dir /home/daminton/git/swiftest/examples/rmvs_swifter_comparison/mars_ejecta/rmvs_encounter_check_simd/ --search-dir sym:p=/home/daminton/git/swiftest --search-dir bin:p=/home/daminton/git/swiftest --search-dir src:rp=/home/daminton/git/swiftest -- /home/daminton/git/swiftest/bin/swiftest_driver rmvs /home/daminton/git/swiftest/examples/rmvs_swifter_comparison/mars_ejecta/config.swiftest.in 
diff --git a/src/rmvs/rmvs_step.f90 b/src/rmvs/rmvs_step.f90
index d36c701fd..906b511c1 100644
--- a/src/rmvs/rmvs_step.f90
+++ b/src/rmvs/rmvs_step.f90
@@ -540,6 +540,7 @@ subroutine rmvs_end_planetocentric(pl, cb, tp)
             associate(cbenci => pl%planetocentric(i)%cb, &
                       tpenci => pl%planetocentric(i)%tp, &
                       plenci => pl%planetocentric(i)%pl)
+               if (allocated(tpind)) deallocate(tpind)
                allocate(tpind(nenc(i)))
                ! Index array of encountering test particles
                if (allocated(encmask)) deallocate(encmask)