Cleaner client config handling