Remove obsolete TODOs introduced in 87efcab