clean-up TODOs before reposting to the store