clean up targetCells implementation