factored out unnecessary tenant domain