do not remove source fields until after a cuboid redraw has been successfully closed