diff --git a/lib/core/interfaces/json_serializable.dart b/lib/core/interfaces/json_serializable.dart
index f62ea3e..1a97b3a 100644
--- a/lib/core/interfaces/json_serializable.dart
+++ b/lib/core/interfaces/json_serializable.dart
@@ -1,6 +1,6 @@
 import 'package:lifting_progress_tracker/firebase/firestore_json.dart';
 
-abstract class JsonSerializable<T> {
+abstract class JsonSerializable {
   // Usage of named constructors can't be enforced, however the usage of
   // both methods is heavily encouraged.
   JsonSerializable.fromJson();
diff --git a/lib/training_plan/models/training_plan.dart b/lib/training_plan/models/training_plan.dart
index a995de9..3dcd969 100644
--- a/lib/training_plan/models/training_plan.dart
+++ b/lib/training_plan/models/training_plan.dart
@@ -2,7 +2,7 @@ import 'package:lifting_progress_tracker/core/interfaces/json_serializable.dart'
 import 'package:lifting_progress_tracker/firebase/firestore_json.dart';
 import 'package:lifting_progress_tracker/training_plan/models/training_plan_entry.dart';
 
-class TrainingPlan implements JsonSerializable<TrainingPlan> {
+class TrainingPlan implements JsonSerializable {
   Map<String, TrainingPlanEntry> planEntries;
 
   TrainingPlan.fromJson(FirestoreJson json)
diff --git a/lib/training_plan/models/training_plan_entry.dart b/lib/training_plan/models/training_plan_entry.dart
index d8afe46..a3fb124 100644
--- a/lib/training_plan/models/training_plan_entry.dart
+++ b/lib/training_plan/models/training_plan_entry.dart
@@ -1,7 +1,7 @@
 import 'package:lifting_progress_tracker/core/interfaces/json_serializable.dart';
 import 'package:lifting_progress_tracker/firebase/firestore_json.dart';
 
-class TrainingPlanEntry implements JsonSerializable<TrainingPlanEntry> {
+class TrainingPlanEntry implements JsonSerializable {
   String repeats;
   String exerciseName;
   String weight;
diff --git a/lib/training_plan/models/training_plan_list.dart b/lib/training_plan/models/training_plan_list.dart
index e727349..cd277c5 100644
--- a/lib/training_plan/models/training_plan_list.dart
+++ b/lib/training_plan/models/training_plan_list.dart
@@ -2,7 +2,7 @@ import 'package:lifting_progress_tracker/core/interfaces/json_serializable.dart'
 import 'package:lifting_progress_tracker/firebase/firestore_json.dart';
 import 'package:lifting_progress_tracker/training_plan/models/training_plan.dart';
 
-class TrainingPlanList implements JsonSerializable<TrainingPlanList> {
+class TrainingPlanList implements JsonSerializable {
   Map<String, TrainingPlan> trainingPlanList;
 
   TrainingPlanList(this.trainingPlanList);
diff --git a/test_utils/mocks/firestore_mock_service.dart b/test_utils/mocks/firestore_mock_service.dart
index 4bbd203..38bb469 100644
--- a/test_utils/mocks/firestore_mock_service.dart
+++ b/test_utils/mocks/firestore_mock_service.dart
@@ -5,18 +5,4 @@ import 'firestore_mock_data.dart';
 
 class MockFirestoreService extends Mock implements FirestoreService {
   final MockFirestoreData mockFirestoreData = MockFirestoreData();
-
-// @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 {}
 }