DDF-495 removed a couple TODOs that were no longer applicable