Clean up related to QA of 1359, fields not cleared after domain add

unrelated to conn-1121, just didn't have a ticket to tie this too and it was my current pr branch.