diff --git a/tests/parser/functions/test_minmax_value.py b/tests/parser/functions/test_minmax_value.py
index 0673182e05..a82db870f5 100644
--- a/tests/parser/functions/test_minmax_value.py
+++ b/tests/parser/functions/test_minmax_value.py
@@ -1,8 +1,7 @@
 import pytest
 
-from vyper.exceptions import InvalidType, OverflowException
+from vyper.exceptions import OverflowException
 from vyper.semantics.types import DecimalT, IntegerT
-from vyper.semantics.types.shortcuts import INT256_T, UINT256_T
 
 
 @pytest.mark.parametrize("typ", sorted(IntegerT.all() + (DecimalT(),)))
diff --git a/tests/parser/types/numbers/test_constants.py b/tests/parser/types/numbers/test_constants.py
index d185d6290f..9f52cb76bd 100644
--- a/tests/parser/types/numbers/test_constants.py
+++ b/tests/parser/types/numbers/test_constants.py
@@ -4,7 +4,7 @@
 import pytest
 
 from vyper.compiler import compile_code
-from vyper.exceptions import InvalidType, TypeMismatch
+from vyper.exceptions import TypeMismatch
 from vyper.utils import MemoryPositions
 
 
diff --git a/tests/parser/types/numbers/test_decimals.py b/tests/parser/types/numbers/test_decimals.py
index a47127a337..876d711154 100644
--- a/tests/parser/types/numbers/test_decimals.py
+++ b/tests/parser/types/numbers/test_decimals.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-from vyper.exceptions import DecimalOverrideException, InvalidOperation, TypeMismatch
+from vyper.exceptions import DecimalOverrideException, InvalidOperation
 from vyper.utils import DECIMAL_EPSILON, SizeLimits
 
 
diff --git a/tests/parser/types/test_lists.py b/tests/parser/types/test_lists.py
index 58c6089766..a9e09a12eb 100644
--- a/tests/parser/types/test_lists.py
+++ b/tests/parser/types/test_lists.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from vyper.exceptions import ArrayIndexException, InvalidType, OverflowException, TypeMismatch
+from vyper.exceptions import ArrayIndexException, OverflowException, TypeMismatch
 
 
 def test_list_tester_code(get_contract_with_gas_estimation):
diff --git a/vyper/ast/folding.py b/vyper/ast/folding.py
index ccf128ed62..c1d66c05a5 100644
--- a/vyper/ast/folding.py
+++ b/vyper/ast/folding.py
@@ -25,7 +25,7 @@ def fold(vyper_module: vy_ast.Module) -> None:
         changed_nodes += replace_builtin_functions(vyper_module)
 
     for node in vyper_module.get_children(vy_ast.VariableDecl, {"is_constant": True}):
-        vyper_module.remove_from_body(node)    
+        vyper_module.remove_from_body(node)
 
 
 def replace_literal_ops(vyper_module: vy_ast.Module) -> int:
diff --git a/vyper/builtins/_signatures.py b/vyper/builtins/_signatures.py
index 89b04b2a2e..6f70a1d674 100644
--- a/vyper/builtins/_signatures.py
+++ b/vyper/builtins/_signatures.py
@@ -1,13 +1,13 @@
 import functools
 from typing import Dict
 
-from vyper.semantics.namespace import get_namespace
 from vyper.ast import nodes as vy_ast
 from vyper.ast.validation import validate_call_args
 from vyper.codegen.expr import Expr
 from vyper.codegen.ir_node import IRnode
 from vyper.exceptions import CompilerPanic, TypeMismatch, UnfoldableNode, VyperException
 from vyper.semantics.analysis.utils import get_exact_type_from_node, validate_expected_type
+from vyper.semantics.namespace import get_namespace
 from vyper.semantics.types import TYPE_T, KwargSettings, VyperType
 from vyper.semantics.types.utils import type_from_annotation
 
diff --git a/vyper/semantics/analysis/module.py b/vyper/semantics/analysis/module.py
index 1180030bf2..9a97a9bfe0 100644
--- a/vyper/semantics/analysis/module.py
+++ b/vyper/semantics/analysis/module.py
@@ -84,8 +84,8 @@ def __init__(
 
             if not derived_nodes:
                 break
-        
-        # attach temporary namespace with constants to the module for 
+
+        # attach temporary namespace with constants to the module for
         # typechecking
         _ns = Namespace()
         _ns._constants = self.namespace._constants