Get rid of old todos

Cause they’re already fucking done
Merge pull request #1877 from JohnONolan/old-todos

Get rid of old todos