Remove gibberish in TODO
Fix some of aacoppa's silly-ass code.