Start redesing of wake fields. Some clean-up of particles.