remove todos which are obsolete now