More cleanup, particles and fluids updates