Removes some obsoletes TODOs