diff --git a/lib/data/models/group_model.dart b/lib/data/models/group_model.dart
index 23f74f558..6680c16a1 100644
--- a/lib/data/models/group_model.dart
+++ b/lib/data/models/group_model.dart
@@ -65,19 +65,14 @@ abstract class GroupEntity extends Object
   SettingsEntity get settings;
 
   int compareTo(GroupEntity group, String sortField, bool sortAscending) {
-    int response = 0;
+    const int response = 0;
     final GroupEntity groupA = sortAscending ? this : group;
     final GroupEntity groupB = sortAscending ? group : this;
 
     switch (sortField) {
-      /*
-      case GroupFields.balance:
-        response = groupA.balance.compareTo(groupB.balance);
-        break;
-      case GroupFields.updatedAt:
-        response = groupA.updatedAt.compareTo(groupB.updatedAt);
-        break;
-       */
+      case GroupFields.name:
+      //response = groupA.balance.compareTo(groupB.balance);
+      //break;
     }
 
     if (response == 0) {
diff --git a/lib/main.dart b/lib/main.dart
index 9d9e3cace..7dfc24eb0 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -57,7 +57,6 @@ import 'package:invoiceninja_flutter/redux/quote/quote_middleware.dart';
 import 'package:invoiceninja_flutter/ui/group/group_screen.dart';
 import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart';
 import 'package:invoiceninja_flutter/ui/group/view/group_view_vm.dart';
-import 'package:invoiceninja_flutter/redux/group/group_actions.dart';
 import 'package:invoiceninja_flutter/redux/group/group_middleware.dart';
 
 void main({bool isTesting = false}) async {
diff --git a/lib/redux/group/group_actions.dart b/lib/redux/group/group_actions.dart
index f4eaae23d..52139ec5b 100644
--- a/lib/redux/group/group_actions.dart
+++ b/lib/redux/group/group_actions.dart
@@ -239,8 +239,6 @@ class FilterGroupsByEntity implements PersistUI {
 void handleGroupAction(
     BuildContext context, GroupEntity group, EntityAction action) {
   final store = StoreProvider.of<AppState>(context);
-  final state = store.state;
-  final CompanyEntity company = state.selectedCompany;
   final localization = AppLocalization.of(context);
 
   switch (action) {
diff --git a/lib/redux/group/group_reducer.dart b/lib/redux/group/group_reducer.dart
index 8cbc46015..1f8434f9b 100644
--- a/lib/redux/group/group_reducer.dart
+++ b/lib/redux/group/group_reducer.dart
@@ -1,6 +1,5 @@
 import 'package:invoiceninja_flutter/data/models/group_model.dart';
 import 'package:redux/redux.dart';
-import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/company/company_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
diff --git a/lib/redux/group/group_selectors.dart b/lib/redux/group/group_selectors.dart
index 3242f2291..40894e29c 100644
--- a/lib/redux/group/group_selectors.dart
+++ b/lib/redux/group/group_selectors.dart
@@ -1,7 +1,6 @@
 import 'package:invoiceninja_flutter/data/models/group_model.dart';
 import 'package:memoize/memoize.dart';
 import 'package:built_collection/built_collection.dart';
-import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
 
 var memoizedDropdownGroupList = memo3((BuiltMap<String, GroupEntity> groupMap,
diff --git a/lib/ui/group/edit/group_edit.dart b/lib/ui/group/edit/group_edit.dart
index c40582cf8..62be9dddf 100644
--- a/lib/ui/group/edit/group_edit.dart
+++ b/lib/ui/group/edit/group_edit.dart
@@ -33,7 +33,7 @@ class _GroupEditState extends State<GroupEdit> {
 
     _controllers.forEach((controller) => controller.removeListener(_onChanged));
 
-    final group = widget.viewModel.group;
+    //final group = widget.viewModel.group;
     // STARTER: read value - do not remove comment
 
     _controllers.forEach((controller) => controller.addListener(_onChanged));
diff --git a/lib/ui/group/group_screen.dart b/lib/ui/group/group_screen.dart
index 5946a14ca..c572a6240 100644
--- a/lib/ui/group/group_screen.dart
+++ b/lib/ui/group/group_screen.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/data/models/group_model.dart';
 import 'package:invoiceninja_flutter/ui/app/app_scaffold.dart';
-import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/list_filter.dart';
 import 'package:invoiceninja_flutter/ui/app/list_filter_button.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
@@ -10,7 +9,6 @@ import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/ui/group/group_list_vm.dart';
 import 'package:invoiceninja_flutter/redux/group/group_actions.dart';
-import 'package:invoiceninja_flutter/ui/app/app_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart';
 
 class GroupScreen extends StatelessWidget {
@@ -21,7 +19,6 @@ class GroupScreen extends StatelessWidget {
     final store = StoreProvider.of<AppState>(context);
     final state = store.state;
     final company = state.selectedCompany;
-    final user = state.user;
     final localization = AppLocalization.of(context);
 
     return AppScaffold(