diff --git a/bfps/cpp/full_code/NSVEcomplex_particles.cpp b/bfps/cpp/full_code/NSVEcomplex_particles.cpp
index 81c6cd5ff37443fb110a0feb46a0858d274d4489..4ffa148af2ba33fa6c412349d323efafe6035cae 100644
--- a/bfps/cpp/full_code/NSVEcomplex_particles.cpp
+++ b/bfps/cpp/full_code/NSVEcomplex_particles.cpp
@@ -39,25 +39,21 @@ int NSVEcomplex_particles<rnumber>::initialize(void)
     this->NSVE<rnumber>::initialize();
 
     p2p_computer<double, long long int> current_p2p_computer;
-    // TODO: particle interactions are switched off manually for testing purposes.
-    // this needs to be fixed once particle interactions can be properly resolved.
-    current_p2p_computer.setEnable(enable_p2p);
-    //current_p2p_computer.setEnable(false);
+    current_p2p_computer.setEnable(this->enable_p2p);
 
     particles_inner_computer<double, long long int> current_particles_inner_computer(inner_v0);
     current_particles_inner_computer.setEnable(enable_inner);
-    this->cutoff = 1.0;
 
     this->ps = particles_system_builder_with_p2p(
-                this->fs->cvelocity,              // (field object)
-                this->fs->kk,                     // (kspace object, contains dkx, dky, dkz)
-                tracers0_integration_steps, // to check coherency between parameters and hdf input file (nb rhs)
-                (long long int)nparticles,  // to check coherency between parameters and hdf input file
-                this->fs->get_current_fname(),    // particles input filename
-                std::string("/tracers0/state/") + std::to_string(this->fs->iteration), // dataset name for initial input
-                std::string("/tracers0/rhs/")  + std::to_string(this->fs->iteration),  // dataset name for initial input
-                tracers0_neighbours,        // parameter (interpolation no neighbours)
-                tracers0_smoothness,        // parameter
+                this->fs->cvelocity,                                                    // (field object)
+                this->fs->kk,                                                           // (kspace object, contains dkx, dky, dkz)
+                tracers0_integration_steps,                                             // to check coherency between parameters and hdf input file (nb rhs)
+                (long long int)nparticles,                                              // to check coherency between parameters and hdf input file
+                this->fs->get_current_fname(),                                          // particles input filename
+                std::string("/tracers0/state/") + std::to_string(this->fs->iteration),  // dataset name for initial input
+                std::string("/tracers0/rhs/")  + std::to_string(this->fs->iteration),   // dataset name for initial input
+                tracers0_neighbours,                                                    // parameter (interpolation no neighbours)
+                tracers0_smoothness,                                                    // parameter (how many continuous derivatives)
                 this->comm,
                 this->fs->iteration+1,
                 std::move(current_p2p_computer),
@@ -93,7 +89,7 @@ int NSVEcomplex_particles<rnumber>::step(void)
     TIMEZONE("NSVEcomplex_particles::step");
     this->fs->compute_velocity(this->fs->cvorticity);
     this->fs->cvelocity->ift();
-    if(enable_vorticity_omega){
+    if(this->enable_vorticity_omega){
         *this->tmp_vec_field = this->fs->cvorticity->get_cdata();
         this->tmp_vec_field->ift();
         this->ps->completeLoopWithVorticity(this->dt, *this->tmp_vec_field);