diff --git a/molecule/zabbix_manage_repo/tests/test_default.py b/molecule/zabbix_manage_repo/tests/test_default.py
index c0389d423..81d1393f1 100644
--- a/molecule/zabbix_manage_repo/tests/test_default.py
+++ b/molecule/zabbix_manage_repo/tests/test_default.py
@@ -17,48 +17,3 @@ def test_zabbix_manage_repo_installed(host):
     elif os in ["debian", "ubuntu"]:
         result = host.ansible("command", "apt update", check=False, become=True)["rc"]
     assert result == 0
-
-# def test_zabbiserver_running_and_enabled(host):
-#     zabbix = host.service("zabbix-server")
-#     if host.system_info.distribution == "centos":
-#         assert zabbix.is_enabled
-#         assert zabbix.is_running
-#     else:
-#         assert zabbix.is_running
-
-
-# def test_zabbix_package(host):
-#     ansible_data = host.ansible.get_variables()
-#     version = ansible_data['zabbix_server_version']
-#     database = ansible_data['zabbix_server_database']
-
-#     zabbix_server = host.package(f'zabbix-server-%s' % database)
-#     assert str(version) in zabbix_server.version
-
-
-# def test_zabbix_server_dot_conf(host):
-#     zabbix_server_conf = host.file("/etc/zabbix/zabbix_server.conf")
-#     assert zabbix_server_conf.exists
-#     assert zabbix_server_conf.user == "zabbix"
-#     assert zabbix_server_conf.group == "zabbix"
-#     assert zabbix_server_conf.mode == 0o640
-
-#     assert zabbix_server_conf.contains("ListenPort=10051")
-#     assert zabbix_server_conf.contains("DebugLevel=3")
-
-
-# def test_zabbix_include_dir(host):
-#     zabbix_include_dir = host.file("/etc/zabbix/zabbix_server.conf.d")
-#     assert zabbix_include_dir.is_directory
-#     assert zabbix_include_dir.user == "zabbix"
-#     assert zabbix_include_dir.group == "zabbix"
-
-
-# def test_zabbix_server_logfile(host):
-#     zabbix_logfile = host.file("/var/log/zabbix/zabbix_server.log")
-#     assert zabbix_logfile.exists
-#     assert not zabbix_logfile.contains("Access denied for user")
-#     assert not zabbix_logfile.contains("database is down: reconnecting")
-#     assert not zabbix_logfile.contains("Both are missing in the system.")  # Missing fping
-#     assert zabbix_logfile.contains("current database version")
-#     assert zabbix_logfile.contains(r"server #0 started \[main process\]")
diff --git a/roles/zabbix_agent/tasks/RedHat.yml b/roles/zabbix_agent/tasks/RedHat.yml
index 0001a27c5..1d519bd49 100644
--- a/roles/zabbix_agent/tasks/RedHat.yml
+++ b/roles/zabbix_agent/tasks/RedHat.yml
@@ -1,25 +1,6 @@
 ---
 # Tasks specific for RedHat systems
 
-# - name: "RedHat | Install basic repo file"
-#   ansible.builtin.yum_repository:
-#     name: "{{ item.name }}"
-#     description: "{{ item.description }}"
-#     baseurl: "{{ item.baseurl }}"
-#     gpgcheck: "{{ item.gpgcheck }}"
-#     gpgkey: "{{ item.gpgkey }}"
-#     mode: "{{ item.mode | default('0644') }}"
-#     priority: "{{ item.priority | default('99') }}"
-#     state: "{{ item.state | default('present') }}"
-#     proxy: "{{ zabbix_http_proxy | default(omit) }}"
-#   with_items: "{{ zabbix_repo_yum }}"
-#   register: yum_repo_installed
-#   become: true
-#   notify:
-#     - "clean repo files from proxy creds"
-#   tags:
-#     - install
-
 - name: Check if warn parameter can be used for shell module
   ansible.builtin.set_fact:
     produce_warn: False
diff --git a/roles/zabbix_javagateway/tasks/RedHat.yml b/roles/zabbix_javagateway/tasks/RedHat.yml
index c1abcf2b9..37f2fd3b5 100644
--- a/roles/zabbix_javagateway/tasks/RedHat.yml
+++ b/roles/zabbix_javagateway/tasks/RedHat.yml
@@ -1,25 +1,6 @@
 ---
 # Tasks specific for RedHat systems
 
-# - name: "RedHat | Install basic repo file"
-#   ansible.builtin.yum_repository:
-#     name: "{{ item.name }}"
-#     description: "{{ item.description }}"
-#     baseurl: "{{ item.baseurl }}"
-#     gpgcheck: "{{ item.gpgcheck }}"
-#     gpgkey: "{{ item.gpgkey }}"
-#     mode: "{{ item.mode | default('0644') }}"
-#     priority: "{{ item.priority | default('99') }}"
-#     state: "{{ item.state | default('present') }}"
-#     proxy: "{{ zabbix_http_proxy | default(omit) }}"
-#   with_items: "{{ zabbix_repo_yum }}"
-#   register: yum_repo_installed
-#   become: true
-#   notify:
-#     - "clean repo files from proxy creds"
-#   tags:
-#     - install
-
 - name: "RedHat | Installing zabbix-java-gateway"
   ansible.builtin.package:
     pkg: zabbix-java-gateway
diff --git a/roles/zabbix_web/tasks/RedHat.yml b/roles/zabbix_web/tasks/RedHat.yml
index a3ed0fd0d..ab14d640d 100644
--- a/roles/zabbix_web/tasks/RedHat.yml
+++ b/roles/zabbix_web/tasks/RedHat.yml
@@ -4,25 +4,6 @@
   tags:
     - always
 
-# - name: "RedHat | Install basic repo file"
-#   ansible.builtin.yum_repository:
-#     name: "{{ item.name }}"
-#     description: "{{ item.description | default(omit) }}"
-#     baseurl: "{{ item.baseurl }}"
-#     gpgcheck: "{{ item.gpgcheck | default(omit) }}"
-#     gpgkey: "{{ item.gpgkey | default(omit) }}"
-#     mode: "{{ item.mode | default('0644') }}"
-#     priority: "{{ item.priority | default('99') }}"
-#     state: "{{ item.state | default('present') }}"
-#     proxy: "{{ zabbix_http_proxy | default(omit) }}"
-#   with_items: "{{ zabbix_repo_yum }}"
-#   register: yum_repo_installed
-#   become: true
-#   notify:
-#     - "clean repo files from proxy creds"
-#   tags:
-#     - install
-
 - name: "RedHat | Install zabbix-web-{{ zabbix_server_database }}"
   ansible.builtin.yum:
     name: