Clean up config handling a little

UCC git Repository :: git.ucc.asn.au