remove singleton for multi-tenancy