Completed getting server to server propagation also enabled.
Additional clean up.