Remove todo comments in code

[pbcub1]

Todos are being replaced with issues in github. todos should be temporary for yourself only, they will not be accepted in any pull request from now on.