Remove cell class

do not review yet
ok, I can revert that to ListMultimap