Clean up of 2dOBB and Created Particle Class