diff --git a/src/modules/rmvs_classes.f90 b/src/modules/rmvs_classes.f90
index c0b51660d..fe869be63 100644
--- a/src/modules/rmvs_classes.f90
+++ b/src/modules/rmvs_classes.f90
@@ -39,7 +39,6 @@ module rmvs_classes
       logical,      dimension(:),   allocatable :: lperi  !! planetocentric pericenter passage flag (persistent for a full rmvs time step) over a full RMVS time step)
       integer(I4B), dimension(:),   allocatable :: plperP !! index of planet associated with pericenter distance peri (persistent over a full RMVS time step)
       integer(I4B), dimension(:),   allocatable :: plencP !! index of planet that test particle is encountering (not persistent for a full RMVS time step)
-      integer(I4B), dimension(:),   allocatable :: tpencP !! index of next test particle encountering planet
       real(DP),     dimension(:,:), allocatable :: vbeg   !! Planet velocities at beginning ot step
 
       ! The following are used to correctly set the oblateness values of the acceleration during an inner encounter with a planet
@@ -74,10 +73,9 @@ module rmvs_classes
       real(DP),      dimension(:, :, :), allocatable :: xin     !! interpolated heliocentric planet position for inner encounter
       real(DP),      dimension(:, :, :), allocatable :: vin     !! interpolated heliocentric planet velocity for inner encounter
       type(rmvs_tp), dimension(:),       allocatable :: tpenc   !! array of encountering test particles with this planet in planetocentric coordinates
-      type(whm_pl) , dimension(:),    allocatable :: plenc   !! array of massive bodies that includes the Sun, but not the encountering planet in planetocentric coordinates
+      type(whm_pl) , dimension(:),       allocatable :: plenc   !! array of massive bodies that includes the Sun, but not the encountering planet in planetocentric coordinates
       type(rmvs_cb), dimension(:),       allocatable :: cbenc   !! The planet acting as a central body for close encounters
       real(DP),      dimension(:, :, :), allocatable :: aoblin  !! barycentric acceleration on planets due to central body oblateness during inner encounter
-      logical,       dimension(:, :),    allocatable :: encmask !! logical mask indicating which test particles are encountering a particular planet
       integer(I4B),  dimension(:,:),     allocatable :: plind
       !! Note to developers: If you add componenets to this class, be sure to update methods and subroutines that traverse the
       !!    component list, such as rmvs_setup_pl and rmvs_spill_pl