Code cleaning in CellBaseMain