Merge pull request #366 from TheBlueMatt/2019-07-useless-todo-removal