Clean up of Particle stuff