Mostly cleanup. A chunk of comment code nobody needs. Dereference

after delete, erase() on end() iterator, a few more like that.
Killed a dead variable.