So by removing these, we are going to just use the user/tenant_name that the underlying module defaults to?  Do we need/want to be able to override that?