Cleanup - Multiple changes, see description

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