Additional clean up whilst integrating with AS8 domain management.