Remove dead code, comment unfinished business.