diff --git a/fence-agents.spec b/fence-agents.spec
index 4c898d2..1629aef 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -11,7 +11,6 @@ Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.3.3
 Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 URL: https://github.com/ClusterLabs/fence-agents
 Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz
 
@@ -128,7 +127,6 @@ network, storage, or similar. They operate through a unified interface
 
 %package common
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Common base for Fence Agents
 Requires: python3-pexpect python3-pycurl
 BuildArch: noarch
@@ -152,7 +150,6 @@ This package contains support files including the Python fencing library.
 
 %package all
 License: GPLv2+, LGPLv2+ and ASL 2.0
-Group: System Environment/Base
 Summary: Set of unified programs capable of host isolation ("fencing")
 Requires: %{allfenceagents}
 Provides: fence-agents = %{version}-%{release}
@@ -169,7 +166,6 @@ This package serves as a catch-all for all supported fence agents.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package alom
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for SUN ALOM
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -183,7 +179,6 @@ Fence agent for SUN ALOM.
 
 %package amt
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Intel AMT devices
 Requires: amtterm
 Requires: fence-agents-common = %{version}-%{release}
@@ -197,7 +192,6 @@ Fence agent for AMT compatibile devices that are accessed via
 
 %package amt-ws
 License: ASL 2.0
-Group: System Environment/Base
 Summary: Fence agent for Intel AMT (WS-Man) devices
 Requires: fence-agents-common = %{version}-%{release}
 Requires: openwsman-python3
@@ -210,7 +204,6 @@ Fence agent for AMT (WS-Man) devices.
 
 %package apc
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for APC devices
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -223,7 +216,6 @@ Fence agent for APC devices that are accessed via telnet or SSH.
 
 %package apc-snmp
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agents for APC devices (SNMP)
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
@@ -238,7 +230,6 @@ Fence agents for APC devices that are accessed via the SNMP protocol.
 
 %package aws
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Amazon AWS
 Requires: fence-agents-common = %{version}-%{release}
 Requires: python3-boto3
@@ -252,7 +243,6 @@ Fence agent for Amazon AWS instances.
 
 %package azure-arm
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Azure Resource Manager
 Requires: fence-agents-common = %{version}-%{release}
 Requires: python3-azure-sdk
@@ -268,7 +258,6 @@ Fence agent for Azure Resource Manager instances.
 
 %package bladecenter
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for IBM BladeCenter
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -282,7 +271,6 @@ via telnet or SSH.
 
 %package brocade
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Brocade switches
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -295,7 +283,6 @@ Fence agent for Brocade devices that are accessed via telnet or SSH.
 
 %package cisco-mds
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Cisco MDS 9000 series
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
@@ -309,7 +296,6 @@ via the SNMP protocol.
 
 %package cisco-ucs
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Cisco UCS series
 Requires: python3-pycurl
 Requires: fence-agents-common = %{version}-%{release}
@@ -323,7 +309,6 @@ via the SNMP protocol.
 
 %package compute
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Nova compute nodes
 Requires: python3-requests
 Requires: fence-agents-common = %{version}-%{release}
@@ -338,7 +323,6 @@ Fence agent for Nova compute nodes.
 
 %package docker
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Docker
 Requires: python3-pycurl
 Requires: fence-agents-common = %{version}-%{release}
@@ -352,7 +336,6 @@ Fence agent for Docker images that are accessed over HTTP.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package drac
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Dell DRAC
 Requires: telnet
 Requires: fence-agents-common = %{version}-%{release}
@@ -367,7 +350,6 @@ via telnet.
 
 %package drac5
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Dell DRAC 5
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -381,7 +363,6 @@ via telnet or SSH.
 
 %package eaton-snmp
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Eaton network power switches
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
@@ -395,7 +376,6 @@ via the SNMP protocol.
 
 %package emerson
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Emerson devices (SNMP)
 Requires: fence-agents-common = %{version}-%{release}
 BuildArch: noarch
@@ -408,7 +388,6 @@ the SNMP protocol.
 
 %package eps
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for ePowerSwitch 8M+ power switches
 Requires: fence-agents-common = %{version}-%{release}
 BuildArch: noarch
@@ -422,7 +401,6 @@ via the HTTP(s) protocol.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package gce
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for GCE (Google Cloud Engine)
 Requires: fence-agents-common = %{version}-%{release}
 Requires: python3-google-api-client
@@ -438,7 +416,6 @@ Fence agent for GCE (Google Cloud Engine) instances.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package hds-cb
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Hitachi Compute Blade systems
 Requires: telnet
 Requires: fence-agents-common = %{version}-%{release}
@@ -452,7 +429,6 @@ Fence agent for Hitachi Compute Blades that are accessed via telnet.
 
 %package heuristics-ping
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Pseudo fence agent to affect other agents based on ping-heuristics
 Requires: fence-agents-common = %{version}-%{release}
 BuildArch: noarch
@@ -466,7 +442,6 @@ ping-heuristics.
 
 %package hpblade
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for HP BladeSystem devices
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -480,7 +455,6 @@ or SSH.
 
 %package ibmblade
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for IBM BladeCenter
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
@@ -494,7 +468,6 @@ via the SNMP protocol.
 
 %package ifmib
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for devices with IF-MIB interfaces
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
@@ -508,7 +481,6 @@ the SNMP protocol.
 
 %package ilo2
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agents for HP iLO2 devices
 Requires: gnutls-utils
 Requires: fence-agents-common = %{version}-%{release}
@@ -524,7 +496,6 @@ the HTTP(s) protocol.
 
 %package ilo-moonshot
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for HP iLO Moonshot devices
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -538,7 +509,6 @@ via telnet or SSH.
 
 %package ilo-mp
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for HP iLO MP devices
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -551,7 +521,6 @@ Fence agent for HP iLO MP devices that are accessed via telnet or SSH.
 
 %package ilo-ssh
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agents for HP iLO devices over SSH
 Requires: openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -570,7 +539,6 @@ Fence agents for HP iLO devices that are accessed via telnet or SSH.
 
 %package intelmodular
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for devices with Intel Modular interfaces
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
@@ -584,7 +552,6 @@ via the SNMP protocol.
 
 %package ipdu
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for IBM iPDU network power switches
 Requires: net-snmp-utils
 Requires: fence-agents-common = %{version}-%{release}
@@ -598,7 +565,6 @@ via the SNMP protocol.
 
 %package ipmilan
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agents for devices with IPMI interface
 Requires: /usr/bin/ipmitool
 Requires: fence-agents-common = %{version}-%{release}
@@ -622,7 +588,6 @@ Fence agents for devices with IPMI interface.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package ironic
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for OpenStack's Ironic (Bare Metal as a service)
 Requires: /usr/bin/openstack
 Requires: fence-agents-common = %{version}-%{release}
@@ -636,7 +601,6 @@ Fence agent for OpenStack's Ironic (Bare Metal as a service) service.
 
 %package kdump
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for use with kdump crash recovery service
 Requires: fence-agents-common = %{version}-%{release}
 # this cannot be noarch since it's compiled
@@ -651,7 +615,6 @@ Fence agent for use with kdump crash recovery service.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package ldom
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Sun LDom virtual machines
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -666,7 +629,6 @@ Fence agent for APC devices that are accessed via telnet or SSH.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package lpar
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for IBM LPAR
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -680,7 +642,6 @@ Fence agent for IBM LPAR devices that are accessed via telnet or SSH.
 
 %package mpath
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for reservations over Device Mapper Multipath
 Requires: device-mapper-multipath
 Requires: fence-agents-common = %{version}-%{release}
@@ -695,7 +656,6 @@ Device Mapper Multipath.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package netio
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Koukaam NETIO devices
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -711,7 +671,6 @@ via telnet or SSH.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package ovh
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for OVH provider
 Requires: python3-suds
 Requires: fence-agents-common = %{version}-%{release}
@@ -727,7 +686,6 @@ Fence agent for OVH hosting provider.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package pve
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for PVE
 Requires: python3-pycurl
 Requires: fence-agents-common = %{version}-%{release}
@@ -742,7 +700,6 @@ Fence agent for PVE.
 # skipped from allfenceagents
 %package raritan
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Raritan Dominion PX
 Requires: fence-agents-common = %{version}-%{release}
 BuildArch: noarch
@@ -755,7 +712,6 @@ Fence agent for Raritan Dominion PX.
 # skipped from allfenceagents
 %package rcd-serial
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for RCD serial
 Requires: fence-agents-common = %{version}-%{release}
 BuildArch: noarch
@@ -767,7 +723,6 @@ Fence agent for RCD serial.
 
 %package rhevm
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for RHEV-M
 Requires: fence-agents-common = %{version}-%{release}
 BuildArch: noarch
@@ -780,7 +735,6 @@ Fence agent for RHEV-M via REST API.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package rsa
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for IBM RSA II
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -795,7 +749,6 @@ via telnet or SSH.
 
 %package rsb
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Fujitsu RSB
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -810,7 +763,6 @@ via telnet or SSH.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package sanbox2
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for QLogic SANBox2 FC switches
 Requires: telnet
 Requires: fence-agents-common = %{version}-%{release}
@@ -825,7 +777,6 @@ Fence agent for QLogic SANBox2 switches that are accessed via telnet.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package sbd
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for SBD (storage-based death)
 Requires: sbd
 Requires: fence-agents-common = %{version}-%{release}
@@ -839,7 +790,6 @@ Fence agent for SBD (storage-based death).
 
 %package scsi
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for SCSI persistent reservations
 Requires: sg3_utils
 Requires: fence-agents-common = %{version}-%{release}
@@ -855,7 +805,6 @@ Fence agent for SCSI persistent reservations.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package vbox
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for VirtualBox
 Requires: openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -870,7 +819,6 @@ Fence agent for VirtualBox dom0 accessed via SSH.
 # skipped from allfenceagents
 %package virsh
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for virtual machines based on libvirt
 Requires: openssh-clients /usr/bin/virsh
 Requires: fence-agents-common = %{version}-%{release}
@@ -884,7 +832,6 @@ Fence agent for virtual machines that are accessed via SSH.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package vmware
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for VMWare with VI Perl Toolkit or vmrun
 Requires: python3-pexpect
 Requires: fence-agents-common = %{version}-%{release}
@@ -898,7 +845,6 @@ Fence agent for VMWare accessed with VI Perl Toolkit or vmrun.
 
 %package vmware-rest
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for VMWare with REST API
 Requires: fence-agents-common = %{version}-%{release}
 BuildArch: noarch
@@ -911,7 +857,6 @@ Fence agent for VMWare with REST API.
 
 %package vmware-soap
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for VMWare with SOAP API v4.1+
 Requires: python3-suds
 Requires: fence-agents-common = %{version}-%{release}
@@ -925,7 +870,6 @@ Fence agent for VMWare with SOAP API v4.1+.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package vmware-vcloud
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for VMWare vCloud Director
 Requires: fence-agents-common = %{version}-%{release}
 BuildArch: noarch
@@ -939,7 +883,6 @@ Fence agent for VMWare vCloud Director.
 
 %package wti
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for WTI Network power switches
 Requires: telnet openssh-clients
 Requires: fence-agents-common = %{version}-%{release}
@@ -954,7 +897,6 @@ via telnet or SSH.
 %if 0%{?fedora} || 0%{?rhel} > 7
 %package xenapi
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for Citrix XenServer over XenAPI
 Requires: python3-pexpect
 Requires: fence-agents-common = %{version}-%{release}
@@ -970,7 +912,6 @@ Fence agent for Citrix XenServer accessed over XenAPI.
 
 %package zvm
 License: GPLv2+ and LGPLv2+
-Group: System Environment/Base
 Summary: Fence agent for IBM z/VM over IP
 Requires: fence-agents-common = %{version}-%{release}
 BuildArch: noarch