Clean up config/config-file?