diff --git a/setup.py b/setup.py
index f9d55d8..7f3abbc 100644
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,7 @@ def run_tests(self):
         "Programming Language :: Python :: 3.8",
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires=[
-        "cryptojwt>=1.6.0",
+        "cryptojwt==1.6.0",
         "pyOpenSSL",
         "filelock>=3.0.12",
         'pyyaml>=5.1.2'
diff --git a/src/oidcmsg/__init__.py b/src/oidcmsg/__init__.py
index 724b7a7..49f34d0 100644
--- a/src/oidcmsg/__init__.py
+++ b/src/oidcmsg/__init__.py
@@ -1,5 +1,5 @@
 __author__ = "Roland Hedberg"
-__version__ = "1.5.1"
+__version__ = "1.5.3"
 
 import os
 from typing import Dict
@@ -32,39 +32,3 @@ def proper_path(path):
         path += "/"
 
     return path
-
-
-# def add_base_path(conf: Dict[str, str], item_paths: dict, base_path: str):
-#     """
-#     This is for adding a base path to path specified in a configuration
-#
-#     :param conf: Configuration
-#     :param item_paths: The relative item path
-#     :param base_path: An absolute path to add to the relative
-#     """
-#     for section, items in item_paths.items():
-#         if section == "":
-#             part = conf
-#         else:
-#             part = conf.get(section)
-#
-#         if part:
-#             if isinstance(items, list):
-#                 for attr in items:
-#                     _path = part.get(attr)
-#                     if _path:
-#                         if _path.startswith("/"):
-#                             continue
-#                         elif _path == "":
-#                             part[attr] = "./" + _path
-#                         else:
-#                             part[attr] = os.path.join(base_path, _path)
-#             elif items is None:
-#                 if part.startswith("/"):
-#                     continue
-#                 elif part == "":
-#                     conf[section] = "./"
-#                 else:
-#                     conf[section] = os.path.join(base_path, part)
-#             else:  # Assume items is dictionary like
-#                 add_base_path(part, items, base_path)
diff --git a/src/oidcmsg/time_util.py b/src/oidcmsg/time_util.py
index 8991bd7..db514c8 100644
--- a/src/oidcmsg/time_util.py
+++ b/src/oidcmsg/time_util.py
@@ -26,6 +26,7 @@
 import time
 from datetime import datetime
 from datetime import timedelta
+from datetime import timezone
 
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 TIME_FORMAT_WITH_FRAGMENT = re.compile("^(\d{4,4}-\d{2,2}-\d{2,2}T\d{2,2}:\d{2,2}:\d{2,2})\.\d*Z$")
@@ -181,7 +182,8 @@ def time_in_a_while(days=0, seconds=0, microseconds=0, milliseconds=0, minutes=0
     :return: datetime instance using UTC time
     """
     delta = timedelta(days, seconds, microseconds, milliseconds, minutes, hours, weeks)
-    return datetime.utcnow() + delta
+    res = datetime.now(timezone.utc) + delta
+    return res.replace(tzinfo=None)
 
 
 def time_a_while_ago(
@@ -200,7 +202,8 @@ def time_a_while_ago(
     :return: datetime instance using UTC time
     """
     delta = timedelta(days, seconds, microseconds, milliseconds, minutes, hours, weeks)
-    return datetime.utcnow() - delta
+    res = datetime.now(timezone.utc) - delta
+    return res.replace(tzinfo=None)
 
 
 def in_a_while(
@@ -351,7 +354,7 @@ def later_than(after, before):
 
 
 def utc_time_sans_frac():
-    now_timestampt = int(datetime.utcnow().timestamp())
+    now_timestampt = int(datetime.now(timezone.utc).timestamp())
     return now_timestampt