remove some obsolete TODOs