diff --git a/plugins/inventory/openstack.py b/plugins/inventory/openstack.py
index 00a4fb58..a7836e1d 100644
--- a/plugins/inventory/openstack.py
+++ b/plugins/inventory/openstack.py
@@ -6,7 +6,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 DOCUMENTATION = '''
 ---
diff --git a/plugins/modules/os_auth.py b/plugins/modules/os_auth.py
index a61c963a..3d646c6e 100644
--- a/plugins/modules/os_auth.py
+++ b/plugins/modules/os_auth.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_client_config.py b/plugins/modules/os_client_config.py
index 7af48371..6168db11 100644
--- a/plugins/modules/os_client_config.py
+++ b/plugins/modules/os_client_config.py
@@ -5,7 +5,6 @@
 
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['preview'],
diff --git a/plugins/modules/os_coe_cluster.py b/plugins/modules/os_coe_cluster.py
index dbc847fc..0a6d87a6 100644
--- a/plugins/modules/os_coe_cluster.py
+++ b/plugins/modules/os_coe_cluster.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_coe_cluster_template.py b/plugins/modules/os_coe_cluster_template.py
index b30bd4b3..0d2147a9 100644
--- a/plugins/modules/os_coe_cluster_template.py
+++ b/plugins/modules/os_coe_cluster_template.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_flavor_info.py b/plugins/modules/os_flavor_info.py
index 9331bf01..4facd158 100644
--- a/plugins/modules/os_flavor_info.py
+++ b/plugins/modules/os_flavor_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_floating_ip.py b/plugins/modules/os_floating_ip.py
index 0d136c2c..0d83363d 100644
--- a/plugins/modules/os_floating_ip.py
+++ b/plugins/modules/os_floating_ip.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_group.py b/plugins/modules/os_group.py
index cc7917b6..e99774b9 100644
--- a/plugins/modules/os_group.py
+++ b/plugins/modules/os_group.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_group_info.py b/plugins/modules/os_group_info.py
index 52f6c886..1ec308ce 100644
--- a/plugins/modules/os_group_info.py
+++ b/plugins/modules/os_group_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_image.py b/plugins/modules/os_image.py
index fdd8f689..c568289e 100644
--- a/plugins/modules/os_image.py
+++ b/plugins/modules/os_image.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 # TODO(mordred): we need to support "location"(v1) and "locations"(v2)
diff --git a/plugins/modules/os_image_info.py b/plugins/modules/os_image_info.py
index 7671aace..c51d350d 100644
--- a/plugins/modules/os_image_info.py
+++ b/plugins/modules/os_image_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_ironic.py b/plugins/modules/os_ironic.py
index 3fe55455..0dcb72d6 100644
--- a/plugins/modules/os_ironic.py
+++ b/plugins/modules/os_ironic.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_ironic_inspect.py b/plugins/modules/os_ironic_inspect.py
index 1c1616e0..e2e90d68 100644
--- a/plugins/modules/os_ironic_inspect.py
+++ b/plugins/modules/os_ironic_inspect.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_ironic_node.py b/plugins/modules/os_ironic_node.py
index 8ea80997..c0546416 100644
--- a/plugins/modules/os_ironic_node.py
+++ b/plugins/modules/os_ironic_node.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_keypair.py b/plugins/modules/os_keypair.py
index aefd3801..53a42484 100644
--- a/plugins/modules/os_keypair.py
+++ b/plugins/modules/os_keypair.py
@@ -6,7 +6,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_keystone_domain.py b/plugins/modules/os_keystone_domain.py
index 97618396..d3e8361b 100644
--- a/plugins/modules/os_keystone_domain.py
+++ b/plugins/modules/os_keystone_domain.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_keystone_domain_info.py b/plugins/modules/os_keystone_domain_info.py
index 064e4779..5f7a8c8d 100644
--- a/plugins/modules/os_keystone_domain_info.py
+++ b/plugins/modules/os_keystone_domain_info.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_keystone_endpoint.py b/plugins/modules/os_keystone_endpoint.py
index ff81f8cd..c84d5b8f 100644
--- a/plugins/modules/os_keystone_endpoint.py
+++ b/plugins/modules/os_keystone_endpoint.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_keystone_role.py b/plugins/modules/os_keystone_role.py
index 91d669c4..d09ad323 100644
--- a/plugins/modules/os_keystone_role.py
+++ b/plugins/modules/os_keystone_role.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_keystone_service.py b/plugins/modules/os_keystone_service.py
index ab5705d5..f203e42e 100644
--- a/plugins/modules/os_keystone_service.py
+++ b/plugins/modules/os_keystone_service.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_listener.py b/plugins/modules/os_listener.py
index 6f040633..495a590b 100644
--- a/plugins/modules/os_listener.py
+++ b/plugins/modules/os_listener.py
@@ -5,7 +5,6 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['preview'],
diff --git a/plugins/modules/os_loadbalancer.py b/plugins/modules/os_loadbalancer.py
index 1c86d8f2..25013e97 100644
--- a/plugins/modules/os_loadbalancer.py
+++ b/plugins/modules/os_loadbalancer.py
@@ -5,7 +5,6 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['preview'],
diff --git a/plugins/modules/os_member.py b/plugins/modules/os_member.py
index c56502a6..0249a715 100644
--- a/plugins/modules/os_member.py
+++ b/plugins/modules/os_member.py
@@ -5,7 +5,6 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['preview'],
diff --git a/plugins/modules/os_network.py b/plugins/modules/os_network.py
index ec5f79b3..ccf04c15 100644
--- a/plugins/modules/os_network.py
+++ b/plugins/modules/os_network.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_networks_info.py b/plugins/modules/os_networks_info.py
index d5efe9f5..97257b53 100644
--- a/plugins/modules/os_networks_info.py
+++ b/plugins/modules/os_networks_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_nova_flavor.py b/plugins/modules/os_nova_flavor.py
index 629df2cb..1f5c9406 100644
--- a/plugins/modules/os_nova_flavor.py
+++ b/plugins/modules/os_nova_flavor.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_nova_host_aggregate.py b/plugins/modules/os_nova_host_aggregate.py
index dc7aac80..a1e8fe16 100644
--- a/plugins/modules/os_nova_host_aggregate.py
+++ b/plugins/modules/os_nova_host_aggregate.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_object.py b/plugins/modules/os_object.py
index eefbcb6b..24dd811e 100644
--- a/plugins/modules/os_object.py
+++ b/plugins/modules/os_object.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_pool.py b/plugins/modules/os_pool.py
index 0d496ee1..c93112e2 100644
--- a/plugins/modules/os_pool.py
+++ b/plugins/modules/os_pool.py
@@ -5,7 +5,6 @@
 
 from __future__ import absolute_import, division, print_function
 
-__metaclass__ = type
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['preview'],
diff --git a/plugins/modules/os_port.py b/plugins/modules/os_port.py
index 34fad6bc..8a13083c 100644
--- a/plugins/modules/os_port.py
+++ b/plugins/modules/os_port.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_port_info.py b/plugins/modules/os_port_info.py
index 1f54b4ca..822ece24 100644
--- a/plugins/modules/os_port_info.py
+++ b/plugins/modules/os_port_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_project.py b/plugins/modules/os_project.py
index 2876cbe8..8f8abe41 100644
--- a/plugins/modules/os_project.py
+++ b/plugins/modules/os_project.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_project_access.py b/plugins/modules/os_project_access.py
index fbb79e73..27dc7f75 100644
--- a/plugins/modules/os_project_access.py
+++ b/plugins/modules/os_project_access.py
@@ -14,7 +14,6 @@
 # along with this software.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['preview'],
diff --git a/plugins/modules/os_project_info.py b/plugins/modules/os_project_info.py
index d5f91da8..1d805b40 100644
--- a/plugins/modules/os_project_info.py
+++ b/plugins/modules/os_project_info.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_quota.py b/plugins/modules/os_quota.py
index d469e7b7..6aec9bb9 100644
--- a/plugins/modules/os_quota.py
+++ b/plugins/modules/os_quota.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_recordset.py b/plugins/modules/os_recordset.py
index db6ed29e..78efb3ed 100644
--- a/plugins/modules/os_recordset.py
+++ b/plugins/modules/os_recordset.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_router.py b/plugins/modules/os_router.py
index 8b8f4255..d98037f3 100644
--- a/plugins/modules/os_router.py
+++ b/plugins/modules/os_router.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_routers_info.py b/plugins/modules/os_routers_info.py
index c5fa30ef..b277e2f5 100644
--- a/plugins/modules/os_routers_info.py
+++ b/plugins/modules/os_routers_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_security_group.py b/plugins/modules/os_security_group.py
index 666b24fc..097f98ed 100644
--- a/plugins/modules/os_security_group.py
+++ b/plugins/modules/os_security_group.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_security_group_rule.py b/plugins/modules/os_security_group_rule.py
index 8f4e6156..6d86fc92 100644
--- a/plugins/modules/os_security_group_rule.py
+++ b/plugins/modules/os_security_group_rule.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_server.py b/plugins/modules/os_server.py
index 237ee1b2..2fd8285d 100644
--- a/plugins/modules/os_server.py
+++ b/plugins/modules/os_server.py
@@ -8,7 +8,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_server_action.py b/plugins/modules/os_server_action.py
index 5be3d3f9..8d30df4f 100644
--- a/plugins/modules/os_server_action.py
+++ b/plugins/modules/os_server_action.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_server_group.py b/plugins/modules/os_server_group.py
index 05e28029..98155301 100644
--- a/plugins/modules/os_server_group.py
+++ b/plugins/modules/os_server_group.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_server_info.py b/plugins/modules/os_server_info.py
index 79ff91ff..0658c8d1 100644
--- a/plugins/modules/os_server_info.py
+++ b/plugins/modules/os_server_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_server_metadata.py b/plugins/modules/os_server_metadata.py
index 370e35e7..5d68f894 100644
--- a/plugins/modules/os_server_metadata.py
+++ b/plugins/modules/os_server_metadata.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'status': ['preview'],
diff --git a/plugins/modules/os_server_volume.py b/plugins/modules/os_server_volume.py
index 79429c88..89468bc3 100644
--- a/plugins/modules/os_server_volume.py
+++ b/plugins/modules/os_server_volume.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_stack.py b/plugins/modules/os_stack.py
index d399e112..a6d3f250 100644
--- a/plugins/modules/os_stack.py
+++ b/plugins/modules/os_stack.py
@@ -6,7 +6,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_subnet.py b/plugins/modules/os_subnet.py
index 3cbc0562..213b3680 100644
--- a/plugins/modules/os_subnet.py
+++ b/plugins/modules/os_subnet.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_subnets_info.py b/plugins/modules/os_subnets_info.py
index 79c52efa..b7666a80 100644
--- a/plugins/modules/os_subnets_info.py
+++ b/plugins/modules/os_subnets_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_user.py b/plugins/modules/os_user.py
index 32dcde65..f28257ec 100644
--- a/plugins/modules/os_user.py
+++ b/plugins/modules/os_user.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_user_group.py b/plugins/modules/os_user_group.py
index 63d2abb8..ae26d0ae 100644
--- a/plugins/modules/os_user_group.py
+++ b/plugins/modules/os_user_group.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_user_info.py b/plugins/modules/os_user_info.py
index f055516a..2ed61197 100644
--- a/plugins/modules/os_user_info.py
+++ b/plugins/modules/os_user_info.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_user_role.py b/plugins/modules/os_user_role.py
index 916bd912..2ba30ecd 100644
--- a/plugins/modules/os_user_role.py
+++ b/plugins/modules/os_user_role.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_volume.py b/plugins/modules/os_volume.py
index 3dbc402b..44c589a7 100644
--- a/plugins/modules/os_volume.py
+++ b/plugins/modules/os_volume.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/plugins/modules/os_volume_snapshot.py b/plugins/modules/os_volume_snapshot.py
index bbb59758..307d0def 100644
--- a/plugins/modules/os_volume_snapshot.py
+++ b/plugins/modules/os_volume_snapshot.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'status': ['preview'],
diff --git a/plugins/modules/os_zone.py b/plugins/modules/os_zone.py
index 2eafca53..f8135995 100644
--- a/plugins/modules/os_zone.py
+++ b/plugins/modules/os_zone.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
diff --git a/tests/unit/compat/builtins.py b/tests/unit/compat/builtins.py
index 2084b253..0c0c170e 100644
--- a/tests/unit/compat/builtins.py
+++ b/tests/unit/compat/builtins.py
@@ -17,7 +17,6 @@
 
 # Make coding more python3-ish
 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 #
 # Compat for python2.7
diff --git a/tests/unit/compat/mock.py b/tests/unit/compat/mock.py
index eb88b798..fcefbbe0 100644
--- a/tests/unit/compat/mock.py
+++ b/tests/unit/compat/mock.py
@@ -17,7 +17,6 @@
 
 # Make coding more python3-ish
 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 '''
 Compat module for Python3.x's unittest.mock module
diff --git a/tests/unit/compat/unittest.py b/tests/unit/compat/unittest.py
index 4b21f2b0..dcea29bb 100644
--- a/tests/unit/compat/unittest.py
+++ b/tests/unit/compat/unittest.py
@@ -17,7 +17,6 @@
 
 # Make coding more python3-ish
 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 '''
 Compat module for Python2.7's unittest module
diff --git a/tests/unit/mock/loader.py b/tests/unit/mock/loader.py
index 0ee47fbb..c46841cc 100644
--- a/tests/unit/mock/loader.py
+++ b/tests/unit/mock/loader.py
@@ -17,7 +17,6 @@
 
 # Make coding more python3-ish
 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 import os
 
diff --git a/tests/unit/mock/procenv.py b/tests/unit/mock/procenv.py
index 6dd5d810..67965df4 100644
--- a/tests/unit/mock/procenv.py
+++ b/tests/unit/mock/procenv.py
@@ -18,7 +18,6 @@
 
 # Make coding more python3-ish
 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 import sys
 import json
diff --git a/tests/unit/mock/vault_helper.py b/tests/unit/mock/vault_helper.py
index dcce9c78..b90f49fa 100644
--- a/tests/unit/mock/vault_helper.py
+++ b/tests/unit/mock/vault_helper.py
@@ -13,7 +13,6 @@
 
 # Make coding more python3-ish
 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 from ansible.module_utils._text import to_bytes
 
diff --git a/tests/unit/modules/cloud/openstack/test_os_routers_info.py b/tests/unit/modules/cloud/openstack/test_os_routers_info.py
index 391a9c1c..0753bcab 100644
--- a/tests/unit/modules/cloud/openstack/test_os_routers_info.py
+++ b/tests/unit/modules/cloud/openstack/test_os_routers_info.py
@@ -1,5 +1,4 @@
 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 import munch
 
diff --git a/tests/unit/plugins/inventory/test_openstack.py b/tests/unit/plugins/inventory/test_openstack.py
index 5c6f3a2e..2ec20c3f 100644
--- a/tests/unit/plugins/inventory/test_openstack.py
+++ b/tests/unit/plugins/inventory/test_openstack.py
@@ -19,7 +19,6 @@
 
 # Make coding more python3-ish
 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
 
 import pytest
 
diff --git a/tools/build.py b/tools/build.py
index d55505ad..e8b6e0da 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -13,10 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# The next two lines are pointless for this file, but the collection
+# The next line is pointless for this file, but the collection
 # linter freaks out if they are not there.
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type
 
 import pbr.version
 
diff --git a/tox.ini b/tox.ini
index 41e0ab9e..6f8c1906 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,9 +49,9 @@ commands = {posargs}
 #      Also, both openstacksdk and Donald Knuth disagree with the rule. Line
 #      breaks should occur before the binary operator for readability.
 # H4 are rules for docstrings. Maybe we should clean them?
-# E501,E402,H301,H236 are ignored so we can import the existing
+# E501,E402,H301 are ignored so we can import the existing
 #      modules unchanged and then clean them in subsequent patches.
-ignore = W503,H4,E501,E402,H301,H236
+ignore = W503,H4,E501,E402,H301
 show-source = True
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,ansible_collections