diff --git a/modules/buildhistory.py b/modules/buildhistory.py
index 0c13cb4..407a1e5 100644
--- a/modules/buildhistory.py
+++ b/modules/buildhistory.py
@@ -20,13 +20,7 @@
 #
 
 import os
-import logging as log
-from logging import debug as D
-from logging import info as I
 from logging import warning as W
-from logging import error as E
-from logging import critical as C
-import sys
 
 from errors import *
 from utils.git import Git
diff --git a/modules/steps.py b/modules/steps.py
index 08f47fd..93cb3a6 100644
--- a/modules/steps.py
+++ b/modules/steps.py
@@ -20,16 +20,12 @@
 #
 
 import os
-import sys
-import subprocess
 import shutil
 import re
 
 from logging import debug as D
 from logging import info as I
 from logging import warning as W
-from logging import error as E
-from logging import critical as C
 
 from errors import *
 from buildhistory import BuildHistory
diff --git a/modules/testimage.py b/modules/testimage.py
index 849a9f1..85ee4f3 100644
--- a/modules/testimage.py
+++ b/modules/testimage.py
@@ -22,15 +22,8 @@
 #
 
 import os
-import sys
-import shutil
 
-import logging as log
-from logging import debug as D
 from logging import info as I
-from logging import warning as W
-from logging import error as E
-from logging import critical as C
 
 from errors import *
 from utils.bitbake import *
diff --git a/modules/utils/bitbake.py b/modules/utils/bitbake.py
index 32c234c..ad011db 100644
--- a/modules/utils/bitbake.py
+++ b/modules/utils/bitbake.py
@@ -24,11 +24,7 @@
 #
 
 import os
-import logging as log
-from logging import info as I
 from logging import debug as D
-from logging import error as E
-from logging import critical as C
 import sys
 import re
 
diff --git a/modules/utils/devtool.py b/modules/utils/devtool.py
index b3a9ce7..d4b7ba7 100644
--- a/modules/utils/devtool.py
+++ b/modules/utils/devtool.py
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-import os
-import logging as log
 from logging import debug as D
 
 from utils.bitbake import *
diff --git a/modules/utils/emailhandler.py b/modules/utils/emailhandler.py
index 1ed4bfc..0629c8f 100644
--- a/modules/utils/emailhandler.py
+++ b/modules/utils/emailhandler.py
@@ -24,7 +24,6 @@
 #
 
 import os
-import logging as log
 from logging import error as E
 from logging import info as I
 from smtplib import SMTP
@@ -33,7 +32,6 @@ from email.mime.text import MIMEText
 from email.mime.application import MIMEApplication
 from email.mime.multipart import MIMEMultipart
 from email.generator import Generator
-import shutil
 from io import StringIO
 
 class Email(object):
diff --git a/modules/utils/git.py b/modules/utils/git.py
index abdcc47..abc1acc 100644
--- a/modules/utils/git.py
+++ b/modules/utils/git.py
@@ -24,7 +24,6 @@
 #
 
 import os
-import logging as log
 from logging import debug as D
 
 from utils.bitbake import *