removed a TODO

(also removed lots of TODOs that still needed doing on the last commit)