Added TODO.  Removed stale code.