Clean: remove couple TODOs - one was just completed - another was overzealous Tests: none, trivial changes