Revert "Using subcell"

This reverts commit 6c02999453f70f8afd69ba329633aee0f2d35245.