Removed old code from CellTypes