CellStates, cleanup

• cell states are now stored in a seperate array