Remove an obsolete user cleanup
Handle empty config files correctly