Issue #3224394: Cleanup code

Brent Gees requested to merge issue/config_import_single-3224394:3224394-cleanup-code into 1.0.x Jul 20, 2021