diff --git a/src/main/python/ddadevops/release-mixin/infrastructure_api.py b/src/main/python/ddadevops/release-mixin/infrastructure_api.py
index bd86de5..dcb5aa2 100644
--- a/src/main/python/ddadevops/release-mixin/infrastructure_api.py
+++ b/src/main/python/ddadevops/release-mixin/infrastructure_api.py
@@ -1,8 +1,8 @@
-from abc import ABC, abstractmethod
-from pathlib import Path
 import json
 import re
 import subprocess as sub
+from abc import ABC, abstractmethod
+from pathlib import Path
 
 
 class FileHandler(ABC):
diff --git a/src/main/python/ddadevops/release-mixin/release_mixin.py b/src/main/python/ddadevops/release-mixin/release_mixin.py
index 03f3c99..fa76f65 100644
--- a/src/main/python/ddadevops/release-mixin/release_mixin.py
+++ b/src/main/python/ddadevops/release-mixin/release_mixin.py
@@ -1,7 +1,4 @@
-import copy
 from ddadevops import DevopsBuild
-from ddadevops import execute
-from ddadevops import gopass_field_from_path, gopass_password_from_path
 from infrastructure import ReleaseRepository, ReleaseTypeRepository, VersionRepository
 from infrastructure_api import GitApi
 from services import PrepareReleaseService, TagAndPushReleaseService
diff --git a/src/main/python/ddadevops/release-mixin/test/test_domain.py b/src/main/python/ddadevops/release-mixin/test/test_domain.py
index 4413856..d93b78d 100644
--- a/src/main/python/ddadevops/release-mixin/test/test_domain.py
+++ b/src/main/python/ddadevops/release-mixin/test/test_domain.py
@@ -1,6 +1,6 @@
-from pathlib import Path
 import sys
 import os
+from pathlib import Path
 
 current = os.path.dirname(os.path.realpath(__file__))
 parent = os.path.dirname(current)
diff --git a/src/main/python/ddadevops/release-mixin/test/test_infrastructure_api.py b/src/main/python/ddadevops/release-mixin/test/test_infrastructure_api.py
index 5782159..8c603f7 100644
--- a/src/main/python/ddadevops/release-mixin/test/test_infrastructure_api.py
+++ b/src/main/python/ddadevops/release-mixin/test/test_infrastructure_api.py
@@ -1,8 +1,8 @@
-from pathlib import Path
-import pytest as pt
-from helper import Helper
 import sys
 import os
+import pytest as pt
+from pathlib import Path
+from helper import Helper
 
 current = os.path.dirname(os.path.realpath(__file__))
 parent = os.path.dirname(current)
diff --git a/src/main/python/ddadevops/release-mixin/test/test_services.py b/src/main/python/ddadevops/release-mixin/test/test_services.py
index 142e8bc..a24341c 100644
--- a/src/main/python/ddadevops/release-mixin/test/test_services.py
+++ b/src/main/python/ddadevops/release-mixin/test/test_services.py
@@ -1,5 +1,3 @@
-import pytest as pt
-from pathlib import Path
 import sys
 import os