Removed the "cell" stuff