Remove cell class

do not review yet