Remove unnecessary check because Default.pm always creates client config.
Rename some variables.