Fixed deprecations in CustomYamlConfig.
Add/remove TODO comments.