Use issues rather than todos

Means clean up the code

sigh