diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py
index 7051ddc446..503529d256 100644
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -50,9 +50,9 @@ CN_CONTAINERS = ["", "-c nrf", "-c amf", "-c smf", "-c upf", "-c ausf", "-c udm"
 def OC_login(cmd, ocUserName, ocPassword, ocProjectName):
 	if ocUserName == '' or ocPassword == '' or ocProjectName == '':
 		HELP.GenericHelp(CONST.Version)
-		sys.exit('Insufficient Parameter: no OC Credentials')
+		raise ValueError('Insufficient Parameter: no OC Credentials')
 	if OCRegistry.startswith("http") or OCRegistry.endswith("/"):
-		sys.exit(f'ocRegistry {OCRegistry} should not start with http:// or https:// and not end on a slash /')
+		raise ValueError(f'ocRegistry {OCRegistry} should not start with http:// or https:// and not end on a slash /')
 	ret = cmd.run(f'oc login -u {ocUserName} -p {ocPassword} --server {OCUrl}')
 	if ret.returncode != 0:
 		logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
@@ -244,7 +244,7 @@ class Cluster:
 		if self.testSvrId == None: self.testSvrId = self.eNBIPAddress
 		if self.imageToPull == '':
 			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter')
+			raise ValueError('Insufficient Parameter')
 		logging.debug(f'Pull OC image {self.imageToPull} to server {self.testSvrId}')
 		self.testCase_id = HTML.testCase_id
 		cmd = cls_cmd.getConnection(self.testSvrId)
@@ -282,19 +282,19 @@ class Cluster:
 	def BuildClusterImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
-			sys.exit(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
+			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
 		lIpAddr = self.eNBIPAddress
 		lSourcePath = self.eNBSourceCodePath
 		if lIpAddr == '' or lSourcePath == '':
-			sys.exit('Insufficient Parameter: eNBSourceCodePath missing')
+			raise ValueError('Insufficient Parameter: eNBSourceCodePath missing')
 		ocUserName = self.OCUserName
 		ocPassword = self.OCPassword
 		ocProjectName = self.OCProjectName
 		if ocUserName == '' or ocPassword == '' or ocProjectName == '':
 			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter: no OC Credentials')
+			raise ValueError('Insufficient Parameter: no OC Credentials')
 		if self.OCRegistry.startswith("http") or self.OCRegistry.endswith("/"):
-			sys.exit(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and not end on a slash /')
+			raise ValueError(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and not end on a slash /')
 
 		logging.debug(f'Building on cluster triggered from server: {lIpAddr}')
 		self.cmd = cls_cmd.RemoteCmd(lIpAddr)
diff --git a/ci-scripts/cls_cmd.py b/ci-scripts/cls_cmd.py
index f0fe2950f8..8784b70831 100644
--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -31,7 +31,6 @@ import subprocess as sp
 import os
 import paramiko
 import uuid
-import sys
 import time
 
 SSHTIMEOUT=7
diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index 42fa260de2..5a3408250a 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -36,17 +36,12 @@ import re	       # reg
 import logging
 import os
 import shutil
-import subprocess
 import time
-import threading
-import cls_cmd
-from multiprocessing import Process, Lock, SimpleQueue
 from zipfile import ZipFile
 
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
-import cls_cluster as OC
 import cls_cmd
 import sshconnection as SSH
 import helpreadme as HELP
diff --git a/ci-scripts/cls_module.py b/ci-scripts/cls_module.py
index f5539606a4..731dd5776a 100644
--- a/ci-scripts/cls_module.py
+++ b/ci-scripts/cls_module.py
@@ -25,14 +25,10 @@
 #---------------------------------------------------------------------
 
 #to use isfile
-import os
-import sys
 import logging
 #time.sleep
 import time
 import re
-import subprocess
-from datetime import datetime
 import yaml
 
 import cls_cmd
@@ -208,13 +204,6 @@ class Module_UE:
 
 	def _enableTrace(self):
 		raise Exception("not implemented")
-		mySSH = sshconnection.SSHConnection()
-		mySSH.open(self.HostIPAddress, self.HostUsername, self.HostPassword)
-		#delete old artifacts
-		mySSH.command('echo ' + ' '  + ' | sudo -S rm -rf ci_qlog','\$',5)
-		#start Trace, artifact is created in home dir
-		mySSH.command('echo $USER; nohup sudo -E QLog/QLog -s ci_qlog -f NR5G.cfg > /dev/null 2>&1 &','\$', 5)
-		mySSH.close()
 
 	def _disableTrace(self):
 		raise Exception("not implemented")
diff --git a/ci-scripts/cls_oai_html.py b/ci-scripts/cls_oai_html.py
index 93176d1375..b2efcc66b7 100644
--- a/ci-scripts/cls_oai_html.py
+++ b/ci-scripts/cls_oai_html.py
@@ -31,14 +31,12 @@
 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
-import sys              # arg
 import re               # reg
 import fileinput
 import logging
 import os
 import time
 import subprocess
-from multiprocessing import Process, Lock, SimpleQueue
 
 import constants as CONST
 
diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 1729a45620..f286aa9558 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -34,7 +34,6 @@
 #-----------------------------------------------------------
 import sys		# arg
 import re		# reg
-import pexpect	# pexpect
 import time		# sleep
 import os
 import logging
@@ -44,16 +43,11 @@ import json
 #import our libs
 import helpreadme as HELP
 import constants as CONST
-import cls_cluster as OC
 import sshconnection
 
 import cls_module
 import cls_cmd
 
-logging.getLogger("matplotlib").setLevel(logging.WARNING)
-import matplotlib.pyplot as plt
-import numpy as np
-
 #-----------------------------------------------------------
 # Helper functions used here and in other classes
 #-----------------------------------------------------------
diff --git a/ci-scripts/cls_physim.py b/ci-scripts/cls_physim.py
index 7d4dd7d33a..ccdd34e9a9 100644
--- a/ci-scripts/cls_physim.py
+++ b/ci-scripts/cls_physim.py
@@ -34,7 +34,6 @@ import sshconnection
 #to update the HTML object
 import cls_oai_html
 import cls_cmd
-from multiprocessing import SimpleQueue
 #for log folder maintenance
 import os
 import re
diff --git a/ci-scripts/cls_static_code_analysis.py b/ci-scripts/cls_static_code_analysis.py
index ed5867c4cb..f2951b0528 100644
--- a/ci-scripts/cls_static_code_analysis.py
+++ b/ci-scripts/cls_static_code_analysis.py
@@ -36,8 +36,6 @@ import re               # reg
 import logging
 import os
 from pathlib import Path
-import time
-from multiprocessing import Process, Lock, SimpleQueue
 
 #-----------------------------------------------------------
 # OAI Testing modules
diff --git a/ci-scripts/epc.py b/ci-scripts/epc.py
index 97d1f1a8cb..e025c514d9 100644
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -38,8 +38,6 @@ import os
 import time
 import signal
 
-from multiprocessing import Process, Lock, SimpleQueue
-
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index b1c661d6aa..3904ac908d 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -57,17 +57,13 @@ import cls_oai_html
 #-----------------------------------------------------------
 import sys		# arg
 import re		# reg
-import pexpect	# pexpect
 import time		# sleep
 import os
 import subprocess
 import xml.etree.ElementTree as ET
 import logging
-import datetime
 import signal
-import subprocess
 import traceback
-from multiprocessing import Process, Lock, SimpleQueue
 logging.basicConfig(
 	level=logging.DEBUG,
 	stream=sys.stdout,
diff --git a/ci-scripts/provideUniqueImageTag.py b/ci-scripts/provideUniqueImageTag.py
index 88d51ca6f8..01b3e25f8f 100644
--- a/ci-scripts/provideUniqueImageTag.py
+++ b/ci-scripts/provideUniqueImageTag.py
@@ -1,5 +1,4 @@
 import argparse
-import os
 import re
 import subprocess
 import sys
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index 9ac1ac0df6..96ec6306e9 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -36,7 +36,6 @@ import re               # reg
 import logging
 import os
 import time
-from multiprocessing import Process, Lock, SimpleQueue
 import yaml
 import cls_cmd