Fixes potential issues with ConfigCleanup. New module-like options