cell: remove dead code, clean-up, reformatting