comment work

and removal of dead code