Remove TODO items
Merge pull request #35 from fluxroot/develop

Remove TODO items