Identifies a couple of TODO comments as being new in 5.0 that need to be resolved.
Removes TODO