diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
index d16d7aa40..c8aa76a4f 100644
--- a/lib/redux/app/app_state.dart
+++ b/lib/redux/app/app_state.dart
@@ -45,16 +45,11 @@ import 'package:invoiceninja_flutter/ui/credit/edit/credit_edit_vm.dart';
 import 'package:invoiceninja_flutter/ui/design/edit/design_edit_vm.dart';
 import 'package:invoiceninja_flutter/ui/group/edit/group_edit_vm.dart';
 import 'package:invoiceninja_flutter/ui/product/edit/product_edit_vm.dart';
-
 // STARTER: import - do not remove comment
 import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart';
 import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart';
-import 'package:invoiceninja_flutter/redux/payment_term/payment_term_state.dart';
-import 'package:invoiceninja_flutter/ui/payment_term/edit/payment_term_edit_vm.dart';
 import 'package:invoiceninja_flutter/redux/payment_term/payment_term_selectors.dart';
-
 import 'package:invoiceninja_flutter/redux/credit/credit_state.dart';
-
 import 'package:invoiceninja_flutter/redux/user/user_state.dart';
 import 'package:invoiceninja_flutter/redux/tax_rate/tax_rate_state.dart';
 import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_state.dart';
diff --git a/lib/redux/payment_term/payment_term_actions.dart b/lib/redux/payment_term/payment_term_actions.dart
index d67f1bd9b..07d75699d 100644
--- a/lib/redux/payment_term/payment_term_actions.dart
+++ b/lib/redux/payment_term/payment_term_actions.dart
@@ -260,8 +260,8 @@ void handlePaymentTermAction(
   }
 
   final store = StoreProvider.of<AppState>(context);
-  final state = store.state;
-  final CompanyEntity company = state.company;
+  //final state = store.state;
+  //final CompanyEntity company = state.company;
   final localization = AppLocalization.of(context);
   final paymentTerm = paymentTerms.first as PaymentTermEntity;
   final paymentTermIds =
diff --git a/lib/ui/payment_term/edit/payment_term_edit.dart b/lib/ui/payment_term/edit/payment_term_edit.dart
index 78bb5efa5..1d446019d 100644
--- a/lib/ui/payment_term/edit/payment_term_edit.dart
+++ b/lib/ui/payment_term/edit/payment_term_edit.dart
@@ -35,7 +35,7 @@ class _PaymentTermEditState extends State<PaymentTermEdit> {
 
     _controllers.forEach((controller) => controller.removeListener(_onChanged));
 
-    final paymentTerm = widget.viewModel.paymentTerm;
+    //final paymentTerm = widget.viewModel.paymentTerm;
     // STARTER: read value - do not remove comment
 
     _controllers.forEach((controller) => controller.addListener(_onChanged));
@@ -68,7 +68,6 @@ class _PaymentTermEditState extends State<PaymentTermEdit> {
   Widget build(BuildContext context) {
     final viewModel = widget.viewModel;
     final localization = AppLocalization.of(context);
-    final paymentTerm = viewModel.paymentTerm;
 
     return EditScaffold(
       title: localization.editPaymentTerm,
diff --git a/lib/ui/payment_term/edit/payment_term_edit_vm.dart b/lib/ui/payment_term/edit/payment_term_edit_vm.dart
index 543ead5fa..568548498 100644
--- a/lib/ui/payment_term/edit/payment_term_edit_vm.dart
+++ b/lib/ui/payment_term/edit/payment_term_edit_vm.dart
@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
-import 'package:invoiceninja_flutter/ui/payment_term/payment_term_screen.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:redux/redux.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
diff --git a/lib/ui/payment_term/payment_term_list.dart b/lib/ui/payment_term/payment_term_list.dart
index 32b3b56e9..cc0b939f8 100644
--- a/lib/ui/payment_term/payment_term_list.dart
+++ b/lib/ui/payment_term/payment_term_list.dart
@@ -1,18 +1,11 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
-import 'package:invoiceninja_flutter/data/models/payment_term_model.dart';
-import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
-import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/payment_term/payment_term_actions.dart';
-import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
 import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart';
 import 'package:invoiceninja_flutter/ui/app/help_text.dart';
 import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
-import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
-import 'package:invoiceninja_flutter/ui/payment_term/payment_term_presenter.dart';
 import 'package:invoiceninja_flutter/ui/app/tables/entity_datatable.dart';
 import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_item.dart';
 import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_vm.dart';
diff --git a/lib/ui/payment_term/payment_term_list_item.dart b/lib/ui/payment_term/payment_term_list_item.dart
index 7d2150245..798a4ae32 100644
--- a/lib/ui/payment_term/payment_term_list_item.dart
+++ b/lib/ui/payment_term/payment_term_list_item.dart
@@ -78,11 +78,11 @@ class PaymentTermListItem extends StatelessWidget {
               Expanded(
                 child: Text(
                   paymentTerm.name,
-                  style: Theme.of(context).textTheme.title,
+                  style: Theme.of(context).textTheme.headline6,
                 ),
               ),
               Text(formatNumber(paymentTerm.listDisplayAmount, context),
-                  style: Theme.of(context).textTheme.title),
+                  style: Theme.of(context).textTheme.headline6),
             ],
           ),
         ),
diff --git a/lib/ui/payment_term/payment_term_list_vm.dart b/lib/ui/payment_term/payment_term_list_vm.dart
index 50bd707cf..f56762e1c 100644
--- a/lib/ui/payment_term/payment_term_list_vm.dart
+++ b/lib/ui/payment_term/payment_term_list_vm.dart
@@ -4,7 +4,6 @@ import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart'
 import 'package:invoiceninja_flutter/ui/app/tables/entity_list.dart';
 import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_item.dart';
 import 'package:redux/redux.dart';
-import 'package:invoiceninja_flutter/ui/design/design_presenter.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart';
diff --git a/lib/ui/payment_term/payment_term_presenter.dart b/lib/ui/payment_term/payment_term_presenter.dart
index d18338e8b..be6d461aa 100644
--- a/lib/ui/payment_term/payment_term_presenter.dart
+++ b/lib/ui/payment_term/payment_term_presenter.dart
@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
-import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/ui/app/presenters/entity_presenter.dart';
 
 class PaymentTermPresenter extends EntityPresenter {
@@ -11,8 +9,8 @@ class PaymentTermPresenter extends EntityPresenter {
 
   @override
   Widget getField({String field, BuildContext context}) {
-    final state = StoreProvider.of<AppState>(context).state;
-    final paymentTerm = entity as InvoiceEntity;
+    //final state = StoreProvider.of<AppState>(context).state;
+    //final paymentTerm = entity as InvoiceEntity;
 
     switch (field) {
     }
diff --git a/lib/ui/payment_term/payment_term_screen.dart b/lib/ui/payment_term/payment_term_screen.dart
index af47bc199..d1af2c2c6 100644
--- a/lib/ui/payment_term/payment_term_screen.dart
+++ b/lib/ui/payment_term/payment_term_screen.dart
@@ -11,7 +11,6 @@ import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/save_cancel_buttons.dart';
 import 'package:invoiceninja_flutter/ui/app/list_scaffold.dart';
 import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart';
-import 'package:invoiceninja_flutter/ui/app/list_filter.dart';
 import 'package:invoiceninja_flutter/ui/payment_term/payment_term_list_vm.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
diff --git a/lib/ui/payment_term/view/payment_term_view.dart b/lib/ui/payment_term/view/payment_term_view.dart
index ef1608523..667b5484d 100644
--- a/lib/ui/payment_term/view/payment_term_view.dart
+++ b/lib/ui/payment_term/view/payment_term_view.dart
@@ -19,7 +19,7 @@ class _PaymentTermViewState extends State<PaymentTermView> {
   @override
   Widget build(BuildContext context) {
     final viewModel = widget.viewModel;
-    final userCompany = viewModel.state.userCompany;
+    //final userCompany = viewModel.state.userCompany;
     final paymentTerm = viewModel.paymentTerm;
 
     return ViewScaffold(
diff --git a/lib/ui/settings/device_settings_list.dart b/lib/ui/settings/device_settings_list.dart
index 38c4fc6e1..dc10c843b 100644
--- a/lib/ui/settings/device_settings_list.dart
+++ b/lib/ui/settings/device_settings_list.dart
@@ -7,7 +7,6 @@ import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
 import 'package:invoiceninja_flutter/ui/settings/device_settings_list_vm.dart';
-import 'package:invoiceninja_flutter/utils/icons.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
 
diff --git a/stubs/ui/stub/stub_list_item b/stubs/ui/stub/stub_list_item
index 17e2e3729..55686508f 100644
--- a/stubs/ui/stub/stub_list_item
+++ b/stubs/ui/stub/stub_list_item
@@ -75,11 +75,11 @@ class StubListItem extends StatelessWidget {
               Expanded(
                 child: Text(
                   stub.name,
-                  style: Theme.of(context).textTheme.title,
+                  style: Theme.of(context).textTheme.headline6,
                 ),
               ),
               Text(formatNumber(stub.listDisplayAmount, context),
-                  style: Theme.of(context).textTheme.title),
+                  style: Theme.of(context).textTheme.headline6),
             ],
           ),
         ),