diff --git a/lib/firebase/services/firestore_service.dart b/lib/firebase/services/firestore_service.dart
index 97970d7..ca2a913 100644
--- a/lib/firebase/services/firestore_service.dart
+++ b/lib/firebase/services/firestore_service.dart
@@ -1,7 +1,6 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:get_it/get_it.dart';
 import 'package:lifting_progress_tracker/firebase/services/firebase_service.dart';
-import 'package:lifting_progress_tracker/firebase/types.dart';
 import 'package:logging/logging.dart';
 
 class FirestoreService {
@@ -12,10 +11,10 @@ class FirestoreService {
   final Logger _logger = Logger('FirestoreService');
 
   FirestoreService() {
-    initialize();
+    _initialize();
   }
 
-  void initialize() {
+  void _initialize() {
     _firebaseService
         .isInitializationComplete()
         .listen((event) => _firestore = FirebaseFirestore.instance);
@@ -43,7 +42,24 @@ class FirestoreService {
         .set(documentData);
   }
 
-  Future<RawFirestoreData?> getRawData(
+  // Future<Map<String, dynamic>?> getRawData(
+  //   String collectionName,
+  //   String documentId,
+  // ) async {
+  //   final DocumentSnapshot<Map<String, dynamic>> documentSnapshot =
+  //       await _firestore.collection(collectionName).doc(documentId).get();
+  //
+  //   if (!documentSnapshot.exists) {
+  //     _logger.severe(
+  //       "Document with id $documentId does not exist.",
+  //     );
+  //     return null;
+  //   }
+  //
+  //   return documentSnapshot.data();
+  // }
+
+  Future<Map<String, dynamic>?> get(
     String collectionName,
     String documentId,
   ) async {
@@ -60,21 +76,21 @@ class FirestoreService {
     return documentSnapshot.data();
   }
 
-  Future<void> uploadRawData(
-    String collectionName,
-    RawFirestoreData data,
-  ) async {
-    _firestore
-        .collection(collectionName)
-        .add(data)
-        .then(
-          (value) =>
-              _logger.info("Data for collection $collectionName was added."),
-        )
-        .catchError(
-          (error) => _logger.severe(
-            "Failed to add data to collection $collectionName: $error",
-          ),
-        );
-  }
+// Future<void> uploadRawData(
+//   String collectionName,
+//   Map<String, dynamic> data,
+// ) async {
+//   _firestore
+//       .collection(collectionName)
+//       .add(data)
+//       .then(
+//         (value) =>
+//             _logger.info("Data for collection $collectionName was added."),
+//       )
+//       .catchError(
+//         (error) => _logger.severe(
+//           "Failed to add data to collection $collectionName: $error",
+//         ),
+//       );
+// }
 }
diff --git a/lib/firebase/types.dart b/lib/firebase/types.dart
deleted file mode 100644
index 4fece64..0000000
--- a/lib/firebase/types.dart
+++ /dev/null
@@ -1 +0,0 @@
-typedef RawFirestoreData = Map<String, dynamic>;
diff --git a/lib/training_plan/default_training_plan_data.dart b/lib/training_plan/default_training_plan_data.dart
index d9fba23..0a87502 100644
--- a/lib/training_plan/default_training_plan_data.dart
+++ b/lib/training_plan/default_training_plan_data.dart
@@ -1,8 +1,6 @@
-import 'package:lifting_progress_tracker/firebase/types.dart';
-
 const trainingPlanId = "trainingPlan1";
 
-const RawFirestoreData defaultTrainingPlan = {
+const Map<String, dynamic> defaultTrainingPlan = {
   'trainingplan1': {
     '0': {
       'exerciseName': 'Deadlift',
diff --git a/test_utils/mocks/firestore_mock_data.dart b/test_utils/mocks/firestore_mock_data.dart
index d11683a..05851ba 100644
--- a/test_utils/mocks/firestore_mock_data.dart
+++ b/test_utils/mocks/firestore_mock_data.dart
@@ -1,10 +1,8 @@
-import 'package:lifting_progress_tracker/firebase/types.dart';
-
 class MockFirestoreData {
-  RawFirestoreData data = {};
+  Map<String, dynamic> data = {};
 
   void setDefaultMockData() {
-    final RawFirestoreData defaultMockData = {
+    final Map<String, dynamic> defaultMockData = {
       'trainingplan1': {
         '0': {
           'exerciseName': 'Deadlift',
@@ -29,11 +27,11 @@ class MockFirestoreData {
   }
 
   void setEmptyMockData() {
-    final RawFirestoreData mockData = {};
+    final Map<String, dynamic> mockData = {};
     data = mockData;
   }
 
-  Future<RawFirestoreData> getAsync() {
+  Future<Map<String, dynamic>> getAsync() {
     return Future.value(data);
   }
 }
diff --git a/test_utils/mocks/firestore_mock_service.dart b/test_utils/mocks/firestore_mock_service.dart
index e60f16f..4bbd203 100644
--- a/test_utils/mocks/firestore_mock_service.dart
+++ b/test_utils/mocks/firestore_mock_service.dart
@@ -1,5 +1,4 @@
 import 'package:lifting_progress_tracker/firebase/services/firestore_service.dart';
-import 'package:lifting_progress_tracker/firebase/types.dart';
 import 'package:mocktail/mocktail.dart';
 
 import 'firestore_mock_data.dart';
@@ -7,17 +6,17 @@ import 'firestore_mock_data.dart';
 class MockFirestoreService extends Mock implements FirestoreService {
   final MockFirestoreData mockFirestoreData = MockFirestoreData();
 
-  @override
-  Future<RawFirestoreData> getRawData(
-    String documentReference,
-    String documentId,
-  ) async {
-    return mockFirestoreData.getAsync();
-  }
-
-  @override
-  Future<void> uploadRawData(
-    String collectionName,
-    RawFirestoreData data,
-  ) async {}
+// @override
+// Future<Map<String, dynamic>> getRawData(
+//   String documentReference,
+//   String documentId,
+// ) async {
+//   return mockFirestoreData.getAsync();
+// }
+//
+// @override
+// Future<void> uploadRawData(
+//   String collectionName,
+//   Map<String, dynamic> data,
+// ) async {}
 }