diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57d410b4..9423e1a4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,13 +26,17 @@ jobs:
       - run: flutter --version
 
       - name: Install sqlite3-dev
-        run: sudo apt install libsqlite3-dev
+        run: sudo apt install libsqlite3-dev lcov
 
       - name: Install app dependencies
         run: flutter pub get
 
+      # Removing some folders from the coverage since these files are not really
+      # part of the app code and just get in the way of the report
       - name: Test app
-        run: flutter test --coverage
+        run: |
+          flutter test --coverage
+          lcov --remove coverage/lcov.info 'lib/l10n/generated/*' 'lib/theme/*'
 
       - name: Coveralls
         uses: coverallsapp/github-action@v2
diff --git a/dart_test.yaml b/dart_test.yaml
index 62bd2746..cfa1c9fd 100644
--- a/dart_test.yaml
+++ b/dart_test.yaml
@@ -1,2 +1,2 @@
 tags:
-  golden:
\ No newline at end of file
+  golden: { }
\ No newline at end of file
diff --git a/lib/database/exercises/type_converters.dart b/lib/database/exercises/type_converters.dart
index b494aa2a..77d54559 100644
--- a/lib/database/exercises/type_converters.dart
+++ b/lib/database/exercises/type_converters.dart
@@ -1,67 +1,11 @@
 import 'dart:convert';
 
 import 'package:drift/drift.dart';
-import 'package:wger/models/exercises/alias.dart';
 import 'package:wger/models/exercises/category.dart';
-import 'package:wger/models/exercises/comment.dart';
 import 'package:wger/models/exercises/equipment.dart';
-import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/exercises/image.dart';
 import 'package:wger/models/exercises/language.dart';
 import 'package:wger/models/exercises/muscle.dart';
-import 'package:wger/models/exercises/translation.dart';
 import 'package:wger/models/exercises/variation.dart';
-import 'package:wger/models/exercises/video.dart';
-
-class ExerciseBaseConverter extends TypeConverter<Exercise, String> {
-  const ExerciseBaseConverter();
-
-  @override
-  Exercise fromSql(String fromDb) {
-    final Map<String, dynamic> baseData = json.decode(fromDb);
-
-    final category = ExerciseCategory.fromJson(baseData['categories']);
-    final musclesPrimary = baseData['muscless'].map((e) => Muscle.fromJson(e)).toList();
-    final musclesSecondary = baseData['musclesSecondary'].map((e) => Muscle.fromJson(e)).toList();
-    final equipment = baseData['equipments'].map((e) => Equipment.fromJson(e)).toList();
-    final images = baseData['images'].map((e) => ExerciseImage.fromJson(e)).toList();
-    final videos = baseData['videos'].map((e) => Video.fromJson(e)).toList();
-
-    final List<Translation> translations = [];
-    for (final exerciseData in baseData['translations']) {
-      final translation = Translation(
-        id: exerciseData['id'],
-        name: exerciseData['name'],
-        description: exerciseData['description'],
-        exerciseId: baseData['id'],
-      );
-      translation.aliases = exerciseData['aliases'].map((e) => Alias.fromJson(e)).toList();
-      translation.notes = exerciseData['notes'].map((e) => Comment.fromJson(e)).toList();
-      translation.language = Language.fromJson(exerciseData['languageObj']);
-      translations.add(translation);
-    }
-
-    final exerciseBase = Exercise(
-      id: baseData['id'],
-      uuid: baseData['uuid'],
-      created: null,
-      //creationDate: toDate(baseData['creation_date']),
-      musclesSecondary: musclesSecondary.cast<Muscle>(),
-      muscles: musclesPrimary.cast<Muscle>(),
-      equipment: equipment.cast<Equipment>(),
-      category: category,
-      images: images.cast<ExerciseImage>(),
-      translations: translations,
-      videos: videos.cast<Video>(),
-    );
-    return exerciseBase;
-  }
-
-  @override
-  String toSql(Exercise value) {
-    return json.encode(value.toJson());
-  }
-}
 
 class MuscleConverter extends TypeConverter<Muscle, String> {
   const MuscleConverter();