More small changes on particle removal

Still crashing