diff --git a/lib/screens/clients/services_modal.dart b/lib/screens/clients/services_modal.dart
index 96dddd2..288de9c 100644
--- a/lib/screens/clients/services_modal.dart
+++ b/lib/screens/clients/services_modal.dart
@@ -68,7 +68,6 @@ class _ServicesModalStateWidget extends State<ServicesModal> {
 
   @override
   Widget build(BuildContext context) {
-    final serversProvider = Provider.of<ServersProvider>(context);
     final filteringProvider = Provider.of<FilteringProvider>(context);
 
     Widget content() {
diff --git a/lib/screens/filters/blocked_services_screen.dart b/lib/screens/filters/blocked_services_screen.dart
index 4e9ee03..eb1bcfe 100644
--- a/lib/screens/filters/blocked_services_screen.dart
+++ b/lib/screens/filters/blocked_services_screen.dart
@@ -128,13 +128,13 @@ class _BlockedServicesScreenStateWidget extends State<BlockedServicesScreen> {
 
         case LoadStatus.loaded:
           return ListView.builder(
-            itemCount: filteringProvider.blockedServices!.services!.length,
+            itemCount: filteringProvider.blockedServices!.services.length,
             itemBuilder: (context, index) => Material(
               color: Colors.transparent,
               child: InkWell(
                 onTap: () => updateValues(
-                  values.contains(filteringProvider.blockedServices!.services![index].id), 
-                  filteringProvider.blockedServices!.services![index]
+                  values.contains(filteringProvider.blockedServices!.services[index].id), 
+                  filteringProvider.blockedServices!.services[index]
                 ),
                 child: Padding(
                   padding: const EdgeInsets.only(
@@ -147,17 +147,17 @@ class _BlockedServicesScreenStateWidget extends State<BlockedServicesScreen> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Text(
-                        filteringProvider.blockedServices!.services![index].name,
+                        filteringProvider.blockedServices!.services[index].name,
                         style: TextStyle(
                           fontSize: 16,
                           color: Theme.of(context).colorScheme.onSurface
                         ),
                       ),
                       Checkbox(
-                        value: values.contains(filteringProvider.blockedServices!.services![index].id), 
+                        value: values.contains(filteringProvider.blockedServices!.services[index].id), 
                         onChanged: (value) => updateValues(
                           value!, 
-                          filteringProvider.blockedServices!.services![index]
+                          filteringProvider.blockedServices!.services[index]
                         ),
                         shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(5)
diff --git a/lib/screens/filters/filters_tabs_view.dart b/lib/screens/filters/filters_tabs_view.dart
index 9e8a7f9..6a36eaf 100644
--- a/lib/screens/filters/filters_tabs_view.dart
+++ b/lib/screens/filters/filters_tabs_view.dart
@@ -9,7 +9,6 @@ import 'package:adguard_home_manager/providers/filters_provider.dart';
 import 'package:adguard_home_manager/constants/enums.dart';
 import 'package:adguard_home_manager/models/filtering.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
-import 'package:adguard_home_manager/providers/servers_provider.dart';
 
 class FiltersTabsView extends StatefulWidget {
   final AppConfigProvider appConfigProvider;
@@ -49,7 +48,6 @@ class _FiltersTabsViewState extends State<FiltersTabsView> with TickerProviderSt
 
   @override
   Widget build(BuildContext context) {
-    final serversProvider = Provider.of<ServersProvider>(context);
     final filteringProvider = Provider.of<FilteringProvider>(context);
 
     return DefaultTabController(
diff --git a/lib/screens/filters/filters_triple_column.dart b/lib/screens/filters/filters_triple_column.dart
index 5cccede..d60a237 100644
--- a/lib/screens/filters/filters_triple_column.dart
+++ b/lib/screens/filters/filters_triple_column.dart
@@ -19,7 +19,6 @@ import 'package:adguard_home_manager/providers/filters_provider.dart';
 import 'package:adguard_home_manager/models/filtering.dart';
 import 'package:adguard_home_manager/functions/number_format.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
-import 'package:adguard_home_manager/providers/servers_provider.dart';
 
 class FiltersTripleColumn extends StatelessWidget {
   final void Function(String) onRemoveCustomRule;
@@ -37,20 +36,9 @@ class FiltersTripleColumn extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final serversProvider = Provider.of<ServersProvider>(context);
     final filteringProvider = Provider.of<FilteringProvider>(context);
     final appConfigProvider = Provider.of<AppConfigProvider>(context);
-
-    bool checkIfComment(String value) {
-      final regex = RegExp(r'^(!|#).*$');
-      if (regex.hasMatch(value)) {
-        return true;
-      }
-      else {
-        return false;
-      }
-    }
-
+    
     Widget? generateSubtitle(String rule) {
       final allowRegex = RegExp(r'^@@.*$');
       final blockRegex = RegExp(r'^\|\|.*$');
diff --git a/lib/screens/filters/list_details_screen.dart b/lib/screens/filters/list_details_screen.dart
index 723c471..9c970a7 100644
--- a/lib/screens/filters/list_details_screen.dart
+++ b/lib/screens/filters/list_details_screen.dart
@@ -16,7 +16,6 @@ import 'package:adguard_home_manager/functions/format_time.dart';
 import 'package:adguard_home_manager/providers/filters_provider.dart';
 import 'package:adguard_home_manager/functions/snackbar.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
-import 'package:adguard_home_manager/providers/servers_provider.dart';
 import 'package:adguard_home_manager/models/filtering.dart';
 
 class ListDetailsScreen extends StatefulWidget {
@@ -61,7 +60,6 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
 
   @override
   Widget build(BuildContext context) {
-    final serversProvider = Provider.of<ServersProvider>(context);
     final filteringProvider = Provider.of<FilteringProvider>(context);
     final appConfigProvider = Provider.of<AppConfigProvider>(context);