Merge pull request #1742 from tnull/2022-09-remove-done-todo