diff --git a/lib/presentation/blood_pressure_screen/models/blood_pressure_model.dart b/lib/presentation/blood_pressure_screen/models/blood_pressure_model.dart
index 1e6c2fa3..b3049c3a 100644
--- a/lib/presentation/blood_pressure_screen/models/blood_pressure_model.dart
+++ b/lib/presentation/blood_pressure_screen/models/blood_pressure_model.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/data/models/selectionPopupModel/selection_popup_model
 /// This class defines the variables used in the [blood_pressure_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class BloodPressureModel extends Equatable {
-  BloodPressureModel({this.dropdownItemList = const []}) {}
+  BloodPressureModel({this.dropdownItemList = const []});
 
   List<SelectionPopupModel> dropdownItemList;
 
diff --git a/lib/presentation/favorite_foods_screen/models/favorite_foods_model.dart b/lib/presentation/favorite_foods_screen/models/favorite_foods_model.dart
index 3df7820b..935c6d29 100644
--- a/lib/presentation/favorite_foods_screen/models/favorite_foods_model.dart
+++ b/lib/presentation/favorite_foods_screen/models/favorite_foods_model.dart
@@ -5,7 +5,7 @@ import 'package:equatable/equatable.dart';
 /// This class defines the variables used in the [favorite_foods_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class FavoriteFoodsModel extends Equatable {
-  FavoriteFoodsModel() {}
+  FavoriteFoodsModel();
 
   FavoriteFoodsModel copyWith() {
     return FavoriteFoodsModel();
diff --git a/lib/presentation/favorite_sports_screen/models/favorite_sports_model.dart b/lib/presentation/favorite_sports_screen/models/favorite_sports_model.dart
index aa5c41b0..418fd75d 100644
--- a/lib/presentation/favorite_sports_screen/models/favorite_sports_model.dart
+++ b/lib/presentation/favorite_sports_screen/models/favorite_sports_model.dart
@@ -5,7 +5,7 @@ import 'package:equatable/equatable.dart';
 /// This class defines the variables used in the [favorite_sports_screen],
 /// and is typically used to hold data that is passed between different parts of the application.
 class FavoriteSportsModel extends Equatable {
-  FavoriteSportsModel() {}
+  FavoriteSportsModel();
 
   FavoriteSportsModel copyWith() {
     return FavoriteSportsModel();
diff --git a/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart b/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart
index b552f694..9382e8d1 100644
--- a/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart
+++ b/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart
@@ -5,7 +5,6 @@ import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
-import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:eatvio_app/widgets/custom_text_form_field.dart';
 import 'package:flutter/material.dart';
 
diff --git a/lib/presentation/weight_screen/weight_screen.dart b/lib/presentation/weight_screen/weight_screen.dart
index f1f14656..aad4c57d 100644
--- a/lib/presentation/weight_screen/weight_screen.dart
+++ b/lib/presentation/weight_screen/weight_screen.dart
@@ -6,7 +6,6 @@ import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/custom_drop_down.dart';
 import 'package:eatvio_app/widgets/next_step_button.dart';
-import 'package:eatvio_app/data/models/userRegistrationModel/user_registration_model.dart';
 import 'package:flutter/material.dart';
 
 class WeightScreen extends StatefulWidget {
diff --git a/lib/theme/custom_button_style.dart b/lib/theme/custom_button_style.dart
index ed9839fe..95a5581e 100644
--- a/lib/theme/custom_button_style.dart
+++ b/lib/theme/custom_button_style.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
 import 'package:eatvio_app/core/app_export.dart';
 import 'package:flutter/material.dart';
 
diff --git a/lib/widgets/base_button.dart b/lib/widgets/base_button.dart
index 51da7f6c..0a572009 100644
--- a/lib/widgets/base_button.dart
+++ b/lib/widgets/base_button.dart
@@ -1,4 +1,3 @@
-import 'package:eatvio_app/core/app_export.dart';
 import 'package:flutter/material.dart';
 
 class BaseButton extends StatelessWidget {
diff --git a/lib/widgets/next_step_button.dart b/lib/widgets/next_step_button.dart
index eb3f7e35..ce972835 100644
--- a/lib/widgets/next_step_button.dart
+++ b/lib/widgets/next_step_button.dart
@@ -1,7 +1,6 @@
 import 'package:eatvio_app/core/app_export.dart';
 import 'package:eatvio_app/widgets/base_button.dart';
 import 'package:flutter/material.dart';
-import 'package:equatable/equatable.dart';
 
 class NextStepButton extends BaseButton {
   NextStepButton({