diff --git a/xCAT-SoftLayer/bin/getslnodes.py b/xCAT-SoftLayer/bin/getslnodes.py
index b8b4b5334..d07c5ddf2 100755
--- a/xCAT-SoftLayer/bin/getslnodes.py
+++ b/xCAT-SoftLayer/bin/getslnodes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Usage: getslnodes.py [-h] [-v] [<hostname-match>]
diff --git a/xCAT-SoftLayer/bin/softlayer_storage.py b/xCAT-SoftLayer/bin/softlayer_storage.py
index 2ed96423a..82b2e8de2 100755
--- a/xCAT-SoftLayer/bin/softlayer_storage.py
+++ b/xCAT-SoftLayer/bin/softlayer_storage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 """
 Usage:
     softlayer_storage.py --type=<type> [--hostname=<hostname> --username=<username> --password=<password> --mountpoint=<mountpoint> ] (mount | unmount)
diff --git a/xCAT-SoftLayer/xCAT-SoftLayer.spec b/xCAT-SoftLayer/xCAT-SoftLayer.spec
index 683b98ea8..32d336108 100644
--- a/xCAT-SoftLayer/xCAT-SoftLayer.spec
+++ b/xCAT-SoftLayer/xCAT-SoftLayer.spec
@@ -26,10 +26,6 @@ Provides: xCAT-SoftLayer = %{epoch}:%{version}
 %description
 xCAT-SoftLayer provides Utilities to make xCAT work in a SoftLayer environment.  This package should be installed on your management server
 
-# %define VERBOSE %(if [ "$VERBOSE" = "1" -o "$VERBOSE" = "yes" ];then echo 1; else echo 0; fi)
-# %define NOVERBOSE %(if [ "$VERBOSE" = "1" -o "$VERBOSE" = "yes" ];then echo 0; else echo 1; fi)
-# %define NOVERBOSE %{?VERBOSE:1}%{!?VERBOSE:0}
-
 %prep
 # %if %NOVERBOSE
 # echo NOVERBOSE is on
diff --git a/xCAT-probe/scripts/dbstats.py b/xCAT-probe/scripts/dbstats.py
index 1a74c3419..b80929959 100755
--- a/xCAT-probe/scripts/dbstats.py
+++ b/xCAT-probe/scripts/dbstats.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- encoding: utf-8 -*-
 from __future__ import print_function
 import argparse
diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
index 07579bbba..912796a0b 100644
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -70,10 +70,6 @@ xCAT-server provides the core server and configuration management components of
 
 %define zvm %(if [ "$zvm" = "1" ];then echo 1; else echo 0; fi)
 
-# %define VERBOSE %(if [ "$VERBOSE" = "1" -o "$VERBOSE" = "yes" ];then echo 1; else echo 0; fi)
-# %define NOVERBOSE %(if [ "$VERBOSE" = "1" -o "$VERBOSE" = "yes" ];then echo 0; else echo 1; fi)
-# %define NOVERBOSE %{?VERBOSE:1}%{!?VERBOSE:0}
-
 %prep
 # %if %NOVERBOSE
 # echo NOVERBOSE is on
@@ -398,8 +394,6 @@ rm -rf $RPM_BUILD_ROOT
 %else
 /etc/init.d/xcatd
 /usr/lib/systemd/system/xcatd.service
-#/etc/%httpconfigdir/conf.orig/xcat-ws.conf.apache24
-#/etc/%httpconfigdir/conf.orig/xcat-ws.conf.apache22
 /etc/apache2/conf.d/xcat-ws.conf
 /etc/httpd/conf.d/xcat-ws.conf
 %endif
diff --git a/xCAT-server/xCAT-wsapi/xcatws-test.py b/xCAT-server/xCAT-wsapi/xcatws-test.py
index 2f37126cf..681377ff4 100755
--- a/xCAT-server/xCAT-wsapi/xcatws-test.py
+++ b/xCAT-server/xCAT-wsapi/xcatws-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Usage:
   xcatws_test.py [--xcatmn=<xcatmn>] [--user=<user>] [--password=<password>]
 """
diff --git a/xCAT-test/autotest/testcase/xcat_inventory/validatehelper b/xCAT-test/autotest/testcase/xcat_inventory/validatehelper
index f903873df..4486c5f55 100755
--- a/xCAT-test/autotest/testcase/xcat_inventory/validatehelper
+++ b/xCAT-test/autotest/testcase/xcat_inventory/validatehelper
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 
 import yaml