Cleanup the subdomain change