Removing now-unwanted TODO.
Removing some dead code.