1 files changed, 3 insertions, 11 deletions
diff --git a/BackEnd/Timeline/Startup.cs b/BackEnd/Timeline/Startup.cs
index 0d7bc6b3..58438d4c 100644
--- a/BackEnd/Timeline/Startup.cs
+++ b/BackEnd/Timeline/Startup.cs
@@ -88,22 +88,14 @@ namespace Timeline
             services.AddAuthorization();
             services.AddSingleton<IAuthorizationPolicyProvider, PermissionPolicyProvider>();
 
-            // TODO: Remove this.
-            services.TryAddSingleton<IActionContextAccessor, ActionContextAccessor>();
-
-            services.AddSingleton<IPathProvider, PathProvider>();
-
+            services.AddBasicServices();
             services.AddDatabaseManagementService();
+            services.AddDataServices();
+            services.AddImageServices();
 
             services.AddAutoMapper(GetType().Assembly);
             services.AddMappers();
 
-            services.AddTransient<IClock, Clock>();
-
-            services.AddScoped<IETagGenerator, ETagGenerator>();
-            services.AddScoped<IDataManager, DataManager>();
-            services.AddScoped<IImageValidator, ImageValidator>();
-
             services.AddDbContext<DatabaseContext>((services, options) =>
             {
                 var pathProvider = services.GetRequiredService<IPathProvider>();