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