Clean: add a couple TODOs for when I'll be going through old analytics code cleanup Tests: none, trivial changes