diff --git a/analysis_options.yaml b/analysis_options.yaml
index e968be9..8ba71f4 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,51 +1,36 @@
 include: package:pedantic/analysis_options.yaml
-analyzer:
-  errors:
-    unused_import: error
-    unused_local_variable: error
-    dead_code: error
-    override_on_non_overriding_method: error
 linter:
   rules:
-    # Errors
     - avoid_empty_else
+    - avoid_init_to_null
+    - avoid_returning_null
+    - avoid_unused_constructor_parameters
     - await_only_futures
+    - camel_case_types
     - comment_references
     - control_flow_in_finally
+    - directives_ordering
+    - empty_constructor_bodies
     - empty_statements
     - hash_and_equals
     - iterable_contains_unrelated_type
-    - no_duplicate_case_values
-    - test_types_in_equals
-    - throw_in_finally
-    - unawaited_futures
-    - unnecessary_statements
-    - unrelated_type_equality_checks
-    - valid_regexps
-
-    # Style
-    #- annotate_overrides
-    #- avoid_function_literals_in_foreach_calls
-    - avoid_init_to_null
-    #- avoid_return_types_on_setters
-    - avoid_returning_null
-    - avoid_unused_constructor_parameters
-    - camel_case_types
-    - directives_ordering
-    #- empty_catches
-    - empty_constructor_bodies
     - library_names
     - library_prefixes
-    #- non_constant_identifier_names
+    - no_duplicate_case_values
     - prefer_conditional_assignment
     - prefer_final_fields
+    - prefer_generic_function_type_aliases
     - prefer_is_empty
     - prefer_is_not_empty
     - prefer_typing_uninitialized_variables
     - recursive_getters
-    #- slash_for_doc_comments
+    - test_types_in_equals
+    - throw_in_finally
     - type_init_formals
+    - unawaited_futures
     - unnecessary_brace_in_string_interps
     - unnecessary_getters_setters
-    #- unnecessary_lambdas
     - unnecessary_null_aware_assignments
+    - unnecessary_statements
+    - unrelated_type_equality_checks
+    - valid_regexps