[task] removed old TODO's
Merge pull request #161 from davidmoebius/todo_removel

Todo removal