Delete TODO from context in compat guide