diff --git a/apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts b/apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts
index 96d860adf1..ca2b338ba6 100644
--- a/apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts
+++ b/apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts
@@ -1,26 +1,17 @@
-import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module';
-import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
-import { RulesService } from '@ghostfolio/api/app/portfolio/rules.service';
+import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';
 import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';
-import { UserModule } from '@ghostfolio/api/app/user/user.module';
 import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';
 import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module';
-import { AccountBalanceModule } from '@ghostfolio/api/services/account-balance/account-balance.module';
-import { AccountModule } from '@ghostfolio/api/services/account/account.module';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.service';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
-import { I18nModule } from '@ghostfolio/api/services/i18n/i18n.module';
 import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';
 import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
-import { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';
 import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
 
@@ -32,34 +23,21 @@ import { BenchmarksService } from './benchmarks.service';
 @Module({
   controllers: [BenchmarksController],
   imports: [
-    AccountBalanceModule,
-    AccountModule,
-    ActivitiesModule,
     ApiModule,
     ConfigurationModule,
     DataProviderModule,
     ExchangeRateDataModule,
-    I18nModule,
     ImpersonationModule,
     MarketDataModule,
-    PortfolioSnapshotQueueModule,
+    PortfolioModule,
     PrismaModule,
     PropertyModule,
     RedisCacheModule,
     SymbolModule,
     SymbolProfileModule,
     TransformDataSourceInRequestModule,
-    TransformDataSourceInResponseModule,
-    UserModule
+    TransformDataSourceInResponseModule
   ],
-  providers: [
-    BenchmarkService,
-    BenchmarksService,
-    CurrentRateService,
-    MarketDataService,
-    PortfolioCalculatorFactory,
-    PortfolioService,
-    RulesService
-  ]
+  providers: [BenchmarkService, BenchmarksService, MarketDataService]
 })
 export class BenchmarksModule {}
diff --git a/apps/api/src/app/endpoints/public/public.module.ts b/apps/api/src/app/endpoints/public/public.module.ts
index 64ffee58f3..732e03bf46 100644
--- a/apps/api/src/app/endpoints/public/public.module.ts
+++ b/apps/api/src/app/endpoints/public/public.module.ts
@@ -1,22 +1,9 @@
 import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module';
-import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
-import { RulesService } from '@ghostfolio/api/app/portfolio/rules.service';
+import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';
 import { UserModule } from '@ghostfolio/api/app/user/user.module';
 import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';
 import { AccessModule } from '@ghostfolio/api/services/access/access.module';
-import { AccountBalanceModule } from '@ghostfolio/api/services/account-balance/account-balance.module';
-import { AccountModule } from '@ghostfolio/api/services/account/account.module';
-import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
-import { I18nModule } from '@ghostfolio/api/services/i18n/i18n.module';
-import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';
-import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';
-import { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';
-import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';
-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
 
 import { Module } from '@nestjs/common';
 
@@ -27,27 +14,12 @@ import { PublicService } from './public.service';
   controllers: [PublicController],
   imports: [
     AccessModule,
-    AccountBalanceModule,
-    AccountModule,
     ActivitiesModule,
-    BenchmarkModule,
-    DataProviderModule,
     ExchangeRateDataModule,
-    I18nModule,
-    ImpersonationModule,
-    MarketDataModule,
-    PortfolioSnapshotQueueModule,
-    RedisCacheModule,
-    SymbolProfileModule,
+    PortfolioModule,
     TransformDataSourceInRequestModule,
     UserModule
   ],
-  providers: [
-    CurrentRateService,
-    PortfolioCalculatorFactory,
-    PortfolioService,
-    PublicService,
-    RulesService
-  ]
+  providers: [PublicService]
 })
 export class PublicModule {}