Cleanup

Cleanup old Todo notes