diff --git a/lib/screens/calendar_screen.dart b/lib/screens/calendar_screen.dart
index cc09ed0..e88f797 100644
--- a/lib/screens/calendar_screen.dart
+++ b/lib/screens/calendar_screen.dart
@@ -1,5 +1,4 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:frederic/backend/authentication/frederic_user_manager.dart';
diff --git a/lib/screens/edit_workout_screen.dart b/lib/screens/edit_workout_screen.dart
index ed103b0..63f8aa5 100644
--- a/lib/screens/edit_workout_screen.dart
+++ b/lib/screens/edit_workout_screen.dart
@@ -40,7 +40,6 @@ class _EditWorkoutScreenState extends State<EditWorkoutScreen> {
 
   @override
   Widget build(BuildContext context) {
-    var width = MediaQuery.of(context).size.width;
     return FredericScaffold(
       body: BlocBuilder<FredericWorkoutManager, FredericWorkoutListData>(
         builder: (context, workoutListData) {
diff --git a/lib/widgets/home_screen/last_workout/last_workout_segment.dart b/lib/widgets/home_screen/last_workout/last_workout_segment.dart
index b0c2249..b873ac2 100644
--- a/lib/widgets/home_screen/last_workout/last_workout_segment.dart
+++ b/lib/widgets/home_screen/last_workout/last_workout_segment.dart
@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/widgets/standard_elements/activity_cards/edit_workout_activity_card.dart b/lib/widgets/standard_elements/activity_cards/edit_workout_activity_card.dart
index c952b8b..1c36b10 100644
--- a/lib/widgets/standard_elements/activity_cards/edit_workout_activity_card.dart
+++ b/lib/widgets/standard_elements/activity_cards/edit_workout_activity_card.dart
@@ -187,13 +187,6 @@ class _EditWorkoutActivityCardState extends State<EditWorkoutActivityCard> {
     Future.delayed(widget.animationDuration)
         .then((value) => widget.onDelete.call());
   }
-
-  Size _textSize(String text, TextStyle? style) {
-    final TextPainter textPainter =
-        TextPainter(text: TextSpan(text: text, style: style), maxLines: 1)
-          ..layout(minWidth: 0, maxWidth: double.infinity);
-    return textPainter.size;
-  }
 }
 
 class SelectSetsAndRepsPopup extends StatefulWidget {
diff --git a/lib/widgets/standard_elements/frederic_date_picker.dart b/lib/widgets/standard_elements/frederic_date_picker.dart
index 956677c..fbe417f 100644
--- a/lib/widgets/standard_elements/frederic_date_picker.dart
+++ b/lib/widgets/standard_elements/frederic_date_picker.dart
@@ -101,12 +101,6 @@ class _FredericDatePickerState extends State<FredericDatePicker> {
                       },
                       child: Container(
                         margin: EdgeInsets.only(right: 12),
-                        decoration: true
-                            ? null
-                            : BoxDecoration(
-                                borderRadius: BorderRadius.circular(8),
-                                border: Border.all(
-                                    color: theme.cardBorderColor, width: 0.6)),
                         child: _WeekDaysSliderDayButton(
                             dayIndex: index,
                             selectedDate: selectedDayIndex,
@@ -217,19 +211,15 @@ class _FredericDatePickerState extends State<FredericDatePicker> {
 ///
 class _WeekDaysSliderDayButton extends StatelessWidget {
   _WeekDaysSliderDayButton(
-      {required this.dayIndex,
-      required this.selectedDate,
-      required this.date,
-      this.dayWidth});
+      {required this.dayIndex, required this.selectedDate, required this.date});
 
   final int dayIndex;
   final int selectedDate;
   final DateTime date;
-  final double? dayWidth;
 
   @override
   Widget build(BuildContext context) {
-    var width = dayWidth ?? (MediaQuery.of(context).size.width / 10);
+    var width = MediaQuery.of(context).size.width / 10;
     return selectedDate == dayIndex
         ? Container(
             width: width,
diff --git a/lib/widgets/workout_player_screen/activity_player_activity_card.dart b/lib/widgets/workout_player_screen/activity_player_activity_card.dart
index 955419c..7e9662f 100644
--- a/lib/widgets/workout_player_screen/activity_player_activity_card.dart
+++ b/lib/widgets/workout_player_screen/activity_player_activity_card.dart
@@ -6,8 +6,6 @@ import 'package:frederic/widgets/standard_elements/frederic_card.dart';
 import 'package:frederic/widgets/standard_elements/frederic_vertical_divider.dart';
 import 'package:frederic/widgets/standard_elements/picture_icon.dart';
 
-import '../../main.dart';
-
 class ActivityPlayerActivityCard extends StatelessWidget {
   ActivityPlayerActivityCard(this.activity,
       {this.disabled = false, this.onTap, this.finished = false});