Merge pull request #695 from jskeet/remove-todos

Tidying up