Removed TODO items from the code

... and added them to the issue tracker on Github.