Remove TODOs that are rather only nice-to-have

Created by  Fabian Neumann  on February 4, 2018
FPM7G6HTRNSM2UZCJA6AFUDXXIAAUKTCEB4Y5ZDYA6XPERLHFW7QC
Change contents