These TODOs seem way out of date... as TODOs usually are. Maybe just cut them out...