Clean up Field and Field3D