diff --git a/lib/data/repositories/webhook_repository.dart b/lib/data/repositories/webhook_repository.dart
index 65c11a46e..c0391ed42 100644
--- a/lib/data/repositories/webhook_repository.dart
+++ b/lib/data/repositories/webhook_repository.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:core';
-import 'package:invoiceninja_flutter/.env.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/data/models/serializers.dart';
@@ -65,7 +64,7 @@ class WebhookRepository {
           credentials.url + '/webhooks', credentials.token,
           data: json.encode(data));
     } else {
-      var url = '${credentials.url}/webhooks/${webhook.id}';
+      final url = '${credentials.url}/webhooks/${webhook.id}';
       response =
           await webClient.put(url, credentials.token, data: json.encode(data));
     }
diff --git a/lib/main.dart b/lib/main.dart
index fc0353d83..7f2f28ebf 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -39,13 +39,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:invoiceninja_flutter/utils/web_stub.dart'
     if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart';
 // STARTER: import - do not remove comment
-import 'package:invoiceninja_flutter/ui/webhook/webhook_screen.dart';
-import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit_vm.dart';
-import 'package:invoiceninja_flutter/ui/webhook/view/webhook_view_vm.dart';
-import 'package:invoiceninja_flutter/ui/webhook/webhook_screen_vm.dart';
-import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart';
 import 'package:invoiceninja_flutter/redux/webhook/webhook_middleware.dart';
-
 import 'package:invoiceninja_flutter/redux/token/token_middleware.dart';
 import 'package:invoiceninja_flutter/redux/payment_term/payment_term_middleware.dart';
 
diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
index 8c3a58a41..06b7619d3 100644
--- a/lib/redux/app/app_state.dart
+++ b/lib/redux/app/app_state.dart
@@ -48,10 +48,7 @@ import 'package:invoiceninja_flutter/ui/product/edit/product_edit_vm.dart';
 // STARTER: import - do not remove comment
 import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart';
 import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit_vm.dart';
-import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart';
-import 'package:invoiceninja_flutter/ui/webhook/edit/webhook_edit_vm.dart';
 import 'package:invoiceninja_flutter/redux/webhook/webhook_selectors.dart';
-
 import 'package:invoiceninja_flutter/redux/token/token_state.dart';
 import 'package:invoiceninja_flutter/ui/token/edit/token_edit_vm.dart';
 import 'package:invoiceninja_flutter/redux/token/token_selectors.dart';
diff --git a/lib/redux/webhook/webhook_actions.dart b/lib/redux/webhook/webhook_actions.dart
index c9999c692..309de1298 100644
--- a/lib/redux/webhook/webhook_actions.dart
+++ b/lib/redux/webhook/webhook_actions.dart
@@ -2,14 +2,11 @@ import 'dart:async';
 import 'package:built_collection/built_collection.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_redux/flutter_redux.dart';
-import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
-import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
-import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class ViewWebhookList extends AbstractNavigatorAction
     implements PersistUI, StopLoading {
@@ -255,8 +252,6 @@ void handleWebhookAction(
   }
 
   final store = StoreProvider.of<AppState>(context);
-  final state = store.state;
-  final CompanyEntity company = state.company;
   final localization = AppLocalization.of(context);
   final webhook = webhooks.first as WebhookEntity;
   final webhookIds = webhooks.map((webhook) => webhook.id).toList();
diff --git a/lib/redux/webhook/webhook_reducer.dart b/lib/redux/webhook/webhook_reducer.dart
index c18c98fc1..913d9d681 100644
--- a/lib/redux/webhook/webhook_reducer.dart
+++ b/lib/redux/webhook/webhook_reducer.dart
@@ -6,7 +6,6 @@ import 'package:invoiceninja_flutter/redux/company/company_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart';
 import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
-import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart';
 import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart';
 import 'package:invoiceninja_flutter/data/models/entities.dart';
 
diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index af247ebad..d98b53e53 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -28,8 +28,6 @@ import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:invoiceninja_flutter/utils/colors.dart';
-// STARTER: import - do not remove comment
-import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart';
 
 class MenuDrawer extends StatelessWidget {
   const MenuDrawer({
diff --git a/starter.sh b/starter.sh
index 5a89d0434..b11912d41 100644
--- a/starter.sh
+++ b/starter.sh
@@ -184,7 +184,7 @@ else
     # Link in new module
     echo "app_state: import"
     comment="STARTER: import - do not remove comment"
-    code="import 'package:${package}\/redux\/${module_snake}\/${module_snake}_state.dart';import 'package:${package}\/ui\/${module_snake}\/edit\/${module_snake}_edit_vm.dart';import 'package:${package}\/redux\/${module_snake}\/${module_snake}_state.dart';import 'package:${package}\/ui\/${module_snake}\/edit\/${module_snake}_edit_vm.dart';import 'package:${package}\/redux\/${module_snake}\/${module_snake}_selectors.dart';${lineBreak}"
+    code="import 'package:${package}\/redux\/${module_snake}\/${module_snake}_state.dart';import 'package:${package}\/ui\/${module_snake}\/edit\/${module_snake}_edit_vm.dart';import 'package:${package}\/redux\/${module_snake}\/${module_snake}_selectors.dart';${lineBreak}"
     sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/redux/app/app_state.dart
 
     echo "app_state: list"
@@ -308,12 +308,7 @@ else
 
     echo "main: import"
     comment="STARTER: import - do not remove comment"
-    code="import 'package:${package}\/ui\/${module_snake}\/${module_snake}_screen.dart';${lineBreak}"
-    code="${code}import 'package:${package}\/ui\/${module_snake}\/edit\/${module_snake}_edit_vm.dart';${lineBreak}"
-    code="${code}import 'package:${package}\/ui\/${module_snake}\/view\/${module_snake}_view_vm.dart';${lineBreak}"
-    code="${code}import 'package:${package}\/ui\/${module_snake}\/${module_snake}_screen_vm.dart';${lineBreak}"
-    code="${code}import 'package:${package}\/redux\/${module_snake}\/${module_snake}_actions.dart';${lineBreak}"
-    code="${code}import 'package:${package}\/redux\/${module_snake}\/${module_snake}_middleware.dart';${lineBreak}"
+    code="import 'package:${package}\/redux\/${module_snake}\/${module_snake}_middleware.dart';${lineBreak}"
     sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/main.dart
 
     comment="STARTER: middleware - do not remove comment"
@@ -362,10 +357,6 @@ else
     code="..${module_camel}State.replace(${module_camel}sReducer(state.${module_camel}State, action))${lineBreak}"
     sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/redux/company/company_reducer.dart
 
-    comment="STARTER: import - do not remove comment"
-    code="import 'package:${package}\/redux\/${module_snake}\/${module_snake}_actions.dart';${lineBreak}"
-    sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/ui/app/menu_drawer.dart
-
     comment="STARTER: menu - do not remove comment"
     code="DrawerTile(${lineBreak}"
     code="${code}company: company,${lineBreak}"
diff --git a/stubs/data/repositories/stub_repository b/stubs/data/repositories/stub_repository
index 5a8c673e5..9384d2237 100644
--- a/stubs/data/repositories/stub_repository
+++ b/stubs/data/repositories/stub_repository
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:core';
-import 'package:invoiceninja_flutter/.env.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/data/models/serializers.dart';
@@ -68,7 +67,7 @@ class StubRepository {
           credentials.token,
           data: json.encode(data));
     } else {
-      var url = '${credentials.url}/stubs/${stub.id}';
+      final url = '${credentials.url}/stubs/${stub.id}';
       response = await webClient.put(url, credentials.token, data: json.encode(data));
     }
 
diff --git a/stubs/redux/stub/stub_actions b/stubs/redux/stub/stub_actions
index cc3efd40b..6f0a786a3 100644
--- a/stubs/redux/stub/stub_actions
+++ b/stubs/redux/stub/stub_actions
@@ -2,14 +2,11 @@ import 'dart:async';
 import 'package:built_collection/built_collection.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_redux/flutter_redux.dart';
-import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
-import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
-import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class ViewStubList extends AbstractNavigatorAction implements PersistUI, StopLoading {
   ViewStubList({
@@ -258,8 +255,6 @@ void handleStubAction(
   }
 
   final store = StoreProvider.of<AppState>(context);
-  final state = store.state;
-  final CompanyEntity company = state.company;
   final localization = AppLocalization.of(context);
   final stub = stubs.first as StubEntity;
   final stubIds = stubs.map((stub) => stub.id).toList();
diff --git a/stubs/redux/stub/stub_reducer b/stubs/redux/stub/stub_reducer
index 56f93395b..2d04c96ab 100644
--- a/stubs/redux/stub/stub_reducer
+++ b/stubs/redux/stub/stub_reducer
@@ -6,7 +6,6 @@ import 'package:invoiceninja_flutter/redux/company/company_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart';
 import 'package:invoiceninja_flutter/redux/stub/stub_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
-import 'package:invoiceninja_flutter/redux/stub/stub_actions.dart';
 import 'package:invoiceninja_flutter/redux/stub/stub_state.dart';
 import 'package:invoiceninja_flutter/data/models/entities.dart';