Remove use of Cell