Removing CustomerScoped in favor of multitenant