Remove TODOs

There are some TODOs in the code, given that these never are addressed until now they are maybe not important anymore this should be removed or transferred into a dedicated issue. 

Code is not an issue tracker...