[ML] TODO resolving/removal