diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart
index 9f1464044..73556328c 100644
--- a/lib/data/models/client_model.dart
+++ b/lib/data/models/client_model.dart
@@ -56,7 +56,7 @@ abstract class ClientEntity extends Object
     implements Built<ClientEntity, ClientEntityBuilder> {
   factory ClientEntity({String id}) {
     return _$ClientEntity._(
-      id: id ?? '${--ClientEntity.counter}',
+      id: id ?? BaseEntity.nextId,
       name: '',
       displayName: '',
       balance: 0.0,
@@ -105,8 +105,6 @@ abstract class ClientEntity extends Object
 
   ClientEntity._();
 
-  static int counter = 0;
-
   ClientEntity get clone => rebuild((b) => b
     ..id = BaseEntity.nextId
     ..isDeleted = false);
@@ -477,8 +475,6 @@ abstract class ContactEntity extends Object
 
   ContactEntity._();
 
-  static int counter = 0;
-
   @BuiltValueField(wireName: 'first_name')
   String get firstName;
 
diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart
index ae3554b37..5a8ab9733 100644
--- a/lib/data/models/company_model.dart
+++ b/lib/data/models/company_model.dart
@@ -369,8 +369,6 @@ abstract class PaymentTermEntity extends Object
 
   PaymentTermEntity._();
 
-  static int counter = 0;
-
   static Serializer<PaymentTermEntity> get serializer =>
       _$paymentTermEntitySerializer;
 
@@ -407,8 +405,6 @@ abstract class TaxRateEntity extends Object
 
   TaxRateEntity._();
 
-  static int counter = 0;
-
   static Serializer<TaxRateEntity> get serializer => _$taxRateEntitySerializer;
 
   String get name;
diff --git a/lib/data/models/credit_model.dart b/lib/data/models/credit_model.dart
index e5b063919..836b42f64 100644
--- a/lib/data/models/credit_model.dart
+++ b/lib/data/models/credit_model.dart
@@ -68,8 +68,6 @@ abstract class CreditEntity extends Object
 
   CreditEntity._();
 
-  static int counter = 0;
-
   CreditEntity get clone => rebuild((b) => b
     ..id = BaseEntity.nextId
     ..isDeleted = false);
diff --git a/lib/data/models/document_model.dart b/lib/data/models/document_model.dart
index 15a16bdac..7a5cc4142 100644
--- a/lib/data/models/document_model.dart
+++ b/lib/data/models/document_model.dart
@@ -64,8 +64,6 @@ abstract class DocumentEntity extends Object
 
   DocumentEntity._();
 
-  static int counter = 0;
-
   String get name;
 
   String get type;
diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart
index 529edb167..75da99b2f 100644
--- a/lib/data/models/expense_model.dart
+++ b/lib/data/models/expense_model.dart
@@ -109,8 +109,6 @@ abstract class ExpenseEntity extends Object
 
   ExpenseEntity._();
 
-  static int counter = 0;
-
   ExpenseEntity get clone => rebuild((b) => b
     ..id = BaseEntity.nextId
     ..isDeleted = false
@@ -390,8 +388,6 @@ abstract class ExpenseCategoryEntity extends Object
 
   ExpenseCategoryEntity._();
 
-  static int counter = 0;
-
   @override
   bool matchesFilter(String filter) {
     if (filter == null || filter.isEmpty) {
diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart
index 5cbbbebf5..aac911fce 100644
--- a/lib/data/models/invoice_model.dart
+++ b/lib/data/models/invoice_model.dart
@@ -145,8 +145,6 @@ abstract class InvoiceEntity extends Object
 
   InvoiceEntity._();
 
-  static int counter = 0;
-
   InvoiceEntity get clone => rebuild((b) => b
     ..id = BaseEntity.nextId
     ..isDeleted = false
@@ -551,8 +549,6 @@ abstract class InvoiceItemEntity extends Object
 
   InvoiceItemEntity._();
 
-  static int counter = 0;
-
   @override
   EntityType get entityType {
     return EntityType.invoiceItem;
@@ -676,8 +672,6 @@ abstract class InvitationEntity extends Object
 
   InvitationEntity._();
 
-  static int counter = 0;
-
   String get key;
 
   String get link;
diff --git a/lib/data/models/payment_model.dart b/lib/data/models/payment_model.dart
index 6fa2bdf00..ec3d41d63 100644
--- a/lib/data/models/payment_model.dart
+++ b/lib/data/models/payment_model.dart
@@ -80,8 +80,6 @@ abstract class PaymentEntity extends Object
 
   PaymentEntity._();
 
-  static int counter = 0;
-
   @override
   EntityType get entityType {
     return EntityType.payment;
diff --git a/lib/data/models/product_model.dart b/lib/data/models/product_model.dart
index 034441163..ed9e567fd 100644
--- a/lib/data/models/product_model.dart
+++ b/lib/data/models/product_model.dart
@@ -67,8 +67,6 @@ abstract class ProductEntity extends Object
 
   ProductEntity._();
 
-  static int counter = 0;
-
   ProductEntity get clone => rebuild((b) => b
     ..id = BaseEntity.nextId
     ..isDeleted = false);
diff --git a/lib/data/models/project_model.dart b/lib/data/models/project_model.dart
index 5c53e9cf3..a079cd0f1 100644
--- a/lib/data/models/project_model.dart
+++ b/lib/data/models/project_model.dart
@@ -70,8 +70,6 @@ abstract class ProjectEntity extends Object
 
   ProjectEntity._();
 
-  static int counter = 0;
-
   ProjectEntity get clone => rebuild((b) => b
     ..id = BaseEntity.nextId
     ..isDeleted = false);
diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart
index 6f15b7a77..2478774fe 100644
--- a/lib/data/models/task_model.dart
+++ b/lib/data/models/task_model.dart
@@ -149,8 +149,6 @@ abstract class TaskEntity extends Object
 
   TaskEntity._();
 
-  static int counter = 0;
-
   TaskEntity get clone => rebuild((b) => b
     ..id = BaseEntity.nextId
     ..isDeleted = false
diff --git a/lib/data/models/vendor_model.dart b/lib/data/models/vendor_model.dart
index 7f36ff0d3..9f6d56e4f 100644
--- a/lib/data/models/vendor_model.dart
+++ b/lib/data/models/vendor_model.dart
@@ -298,8 +298,6 @@ abstract class VendorContactEntity extends Object
     return EntityType.vendorContact;
   }
 
-  static int counter = 0;
-
   @BuiltValueField(wireName: 'first_name')
   String get firstName;
 
diff --git a/lib/ui/app/link_text.dart b/lib/ui/app/link_text.dart
index 8dcf42639..620f898f5 100644
--- a/lib/ui/app/link_text.dart
+++ b/lib/ui/app/link_text.dart
@@ -5,10 +5,10 @@ import 'package:url_launcher/url_launcher.dart';
 class LinkTextSpan extends TextSpan {
   LinkTextSpan({TextStyle style, String url, String text})
       : super(
-      style: style,
-      text: text ?? url,
-      recognizer: TapGestureRecognizer()
-        ..onTap = () {
-          launch(url, forceSafariVC: false);
-        });
+            style: style,
+            text: text ?? url,
+            recognizer: TapGestureRecognizer()
+              ..onTap = () {
+                launch(url, forceSafariVC: false);
+              });
 }
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index 038863ef1..30314f33a 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -14598,8 +14598,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
   String get thankYouForYourPurchase =>
       _localizedValues[localeCode]['thank_you_for_your_purchase'];
 
-  String get all =>
-      _localizedValues[localeCode]['all'];
+  String get all => _localizedValues[localeCode]['all'];
 
   String lookup(String key) {
     final lookupKey = toSnakeCase(key);
diff --git a/stubs/data/models/stub_model b/stubs/data/models/stub_model
index 148e68a07..496680a43 100644
--- a/stubs/data/models/stub_model
+++ b/stubs/data/models/stub_model
@@ -40,7 +40,6 @@ abstract class StubEntity extends Object with BaseEntity implements Built<StubEn
 
   // STARTER: properties - do not remove comment
 
-  static int counter = 0;
   factory StubEntity() {
     return _$StubEntity._(
       id: 0,