Remove references to formFieldCells