removed some dead code.  removed use of some pointers