diff --git a/src/pairs/sim/comm.py b/src/pairs/sim/comm.py
index a881d042bcceae89b01e1407e9f835184c3228d6..5bd9e472c5e17000ae5f83bbb14affafc2d199cd 100644
--- a/src/pairs/sim/comm.py
+++ b/src/pairs/sim/comm.py
@@ -263,7 +263,7 @@ class RemoveExchangedParticles_part1(Lowerable):
     @pairs_host_block
     def lower(self):
         self.sim.module_name("remove_exchanged_particles_pt1")
-        send_pos = self.sim.add_temp_var(self.sim.nlocal)
+        send_pos = self.sim.add_temp_var(self.sim.nlocal - 1)
         for i in For(self.sim, 0, self.comm.nsend_all):
             particle_id = self.comm.send_map[i]
             for need_copy in Branch(self.sim, particle_id < self.sim.nlocal - self.comm.nsend_all):
diff --git a/src/pairs/sim/simulation.py b/src/pairs/sim/simulation.py
index 8f2ab5605a9663051ef49bf2422535bf1e488f1c..ca7d56721a606af3de12514146854cbf4ea2275b 100644
--- a/src/pairs/sim/simulation.py
+++ b/src/pairs/sim/simulation.py
@@ -253,7 +253,6 @@ class Simulation:
 
         timestep = Timestep(self, self.ntimesteps, [
             (comm.exchange(), 20),
-            (EnforcePBC(self), 20),
             (comm.borders(), comm.synchronize(), 20),
             (CellListsBuild(self, self.cell_lists), 20),
             (NeighborListsBuild(self, self.neighbor_lists), 20),