remove obsolete comment
remove a whole bunch of dead code