diff --git a/fence-agents.spec b/fence-agents.spec
index b749009..226b0c9 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -129,7 +129,6 @@ BuildRequires:  openwsman-python3
 BuildRequires:  python3-boto3
 %endif
 %else
-#BuildRequires:  %{python_module openwsman}
 %if %{boto3_br}
 BuildRequires:  %{python_module boto3}
 %endif
@@ -279,15 +278,6 @@ This package serves as a catch-all for all supported fence agents.
 
 %files all
 
-%ifarch x86_64
-%package aliyun
-License:        Apache-2.0 AND GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT
-Group:          System Environment/Base
-Summary:        Fence agent for Alibaba Cloud (Aliyun)
-Requires:       fence-agents-common >= %{version}-%{release}
-Requires:       python3-jmespath >= 0.9.0
-Conflicts:      %{name} < %{version}-%{release}
-
 %package devel
 Summary:        Fence Agents for High Availability
 License:        GPL-2.0-only AND LGPL-2.1-only
@@ -306,6 +296,15 @@ development.
 %{_sbindir}/fence_dummy
 %{_mandir}/man8/fence_dummy*
 
+%ifarch x86_64
+%package aliyun
+License:        Apache-2.0 AND GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT
+Group:          System Environment/Base
+Summary:        Fence agent for Alibaba Cloud (Aliyun)
+Requires:       fence-agents-common >= %{version}-%{release}
+Requires:       python3-jmespath >= 0.9.0
+Conflicts:      %{name} < %{version}-%{release}
+
 %description aliyun
 The fence-agents-aliyun package contains a fence agent for Alibaba Cloud (Aliyun) instances.
 
@@ -349,26 +348,6 @@ Fence agent for AMT compatibile devices that are accessed via
 %{_sbindir}/fence_amt
 %{_mandir}/man8/fence_amt.8*
 
-#%package amt-ws
-#License:        Apache-2.0
-#Summary:        Fence agent for Intel AMT (WS-Man) devices
-#Requires:       fence-agents-common = %{version}-%{release}
-#%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
-#Requires:       openwsman-python3
-#%else
-#Requires:       python3-openwsman
-#%endif
-#Provides:       %{name}-amt_ws = %{version}-%{release}
-#Obsoletes:      %{name}-amt_ws < %{version}-%{release}
-#BuildArch:      noarch
-#
-#%description amt-ws
-#Fence agent for AMT (WS-Man) devices.
-#
-#%files amt-ws
-#%{_sbindir}/fence_amt_ws
-#%{_mandir}/man8/fence_amt_ws.8*
-
 %package apc
 License:        GPL-2.0-or-later AND LGPL-2.0-or-later
 Summary:        Fence agent for APC devices