Remove as many direct calls to cells as possible. Cells are being gradually deprecated.