diff --git a/lib/core/data/dbo/app_theme_dbo.dart b/lib/core/data/dbo/app_theme_dbo.dart
index 53b1771..6c2b09f 100644
--- a/lib/core/data/dbo/app_theme_dbo.dart
+++ b/lib/core/data/dbo/app_theme_dbo.dart
@@ -26,9 +26,7 @@ enum AppThemeDBO {
       case AppThemeEntity.system:
         dbo = AppThemeDBO.system;
         break;
-      default:
-        return AppThemeDBO.system;
-    }
+      }
     return dbo;
   }
 }
diff --git a/lib/core/domain/entity/app_theme_entity.dart b/lib/core/domain/entity/app_theme_entity.dart
index a13e9ca..df6ac23 100644
--- a/lib/core/domain/entity/app_theme_entity.dart
+++ b/lib/core/domain/entity/app_theme_entity.dart
@@ -18,9 +18,7 @@ enum AppThemeEntity {
       case AppThemeDBO.system:
         entity = AppThemeEntity.system;
         break;
-      default:
-        return AppThemeEntity.system;
-    }
+      }
     return entity;
   }
 
diff --git a/lib/features/add_meal/data/dto/fdc_sp/sp_const.dart b/lib/features/add_meal/data/dto/fdc_sp/sp_const.dart
index b8a6241..6cffd5a 100644
--- a/lib/features/add_meal/data/dto/fdc_sp/sp_const.dart
+++ b/lib/features/add_meal/data/dto/fdc_sp/sp_const.dart
@@ -26,9 +26,7 @@ class SPConst {
         return fdcFoodDescriptionEn;
       case SupportedLanguage.de:
         return fdcFoodDescriptionDe;
-      default:
-        return fdcFoodDescriptionEn;
-    }
+      }
   }
 
 }
diff --git a/lib/features/add_meal/data/dto/fdc_sp/sp_fdc_food_dto.dart b/lib/features/add_meal/data/dto/fdc_sp/sp_fdc_food_dto.dart
index 8d80ba7..704ef04 100644
--- a/lib/features/add_meal/data/dto/fdc_sp/sp_fdc_food_dto.dart
+++ b/lib/features/add_meal/data/dto/fdc_sp/sp_fdc_food_dto.dart
@@ -29,9 +29,7 @@ class SpFdcFoodDTO {
         return descriptionEn;
       case SupportedLanguage.de:
         return descriptionDe;
-      default:
-        return descriptionEn;
-    }
+      }
   }
 
   get servingSize => portions
diff --git a/lib/features/add_meal/data/dto/off/off_product_dto.dart b/lib/features/add_meal/data/dto/off/off_product_dto.dart
index 204d106..841c1b5 100644
--- a/lib/features/add_meal/data/dto/off/off_product_dto.dart
+++ b/lib/features/add_meal/data/dto/off/off_product_dto.dart
@@ -40,9 +40,7 @@ class OFFProductDTO {
       case SupportedLanguage.de:
         localeName = product_name_de;
         break;
-      default:
-        return product_name_en;
-    }
+      }
 
     // If local language is not available, return available language
     if (localeName == null || localeName.isEmpty) {
diff --git a/lib/features/edit_meal/presentation/edit_meal_screen.dart b/lib/features/edit_meal/presentation/edit_meal_screen.dart
index f5d9219..2a8d5d0 100644
--- a/lib/features/edit_meal/presentation/edit_meal_screen.dart
+++ b/lib/features/edit_meal/presentation/edit_meal_screen.dart
@@ -276,10 +276,6 @@ class _EditMealScreenState extends State<EditMealScreen> {
           ? _convertToMetric(
               _mealQuantityTextController.text, _mealEntity.mealUnit ?? "0")
           : _mealQuantityTextController.text;
-      final servingQuantity = usesImperialUnits
-          ? _convertToMetric(
-              _servingQuantityTextController.text, _mealEntity.mealUnit ?? "0")
-          : _servingQuantityTextController.text;
 
       final newMealEntity = _editMealBloc.createNewMealEntity(
           _mealEntity,