These clauses are obsoleted by name_to_id?
Provide a message if the config is missing.
Merge branch 'ned/remove-unused-code'