diff --git a/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_feeder.py b/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_feeder.py
index a181967c..9e040ed1 100644
--- a/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_feeder.py
+++ b/src/zepben/ewb/model/cim/extensions/iec61970/base/feeder/lv_feeder.py
@@ -19,6 +19,7 @@
     from zepben.ewb.model.cim.iec61970.base.core.equipment import Equipment
     from zepben.ewb.model.cim.iec61970.base.core.feeder import Feeder
     from zepben.ewb.model.cim.iec61970.base.core.terminal import Terminal
+    from zepben.ewb.model.cim.extensions.iec61970.base.feeder.lv_substation import LvSubstation
 
 
 @zb_dataclass
diff --git a/src/zepben/ewb/model/cim/iec61970/base/core/terminal.py b/src/zepben/ewb/model/cim/iec61970/base/core/terminal.py
index 5c1c693b..9c4a4054 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/core/terminal.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/core/terminal.py
@@ -18,7 +18,6 @@
 from zepben.ewb.services.network.tracing.feeder.feeder_direction import FeederDirection
 from zepben.ewb.services.network.tracing.phases.phase_status import PhaseStatus
 from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass
-from zepben.ewb import IdentifiedObject
 
 if TYPE_CHECKING:
     from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment
diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment.py b/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment.py
index 43559f33..b56861c4 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/wires/ac_line_segment.py
@@ -16,8 +16,10 @@
 from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass
 
 if TYPE_CHECKING:
+    from zepben.ewb.model.cim.iec61968.assetinfo.wire_info import WireInfo
     from zepben.ewb.model.cim.iec61970.base.wires.clamp import Clamp
     from zepben.ewb.model.cim.iec61970.base.wires.cut import Cut
+    from zepben.ewb.model.cim.iec61970.base.wires.per_length_impedance import PerLengthImpedance
     from zepben.ewb.model.cim.iec61970.base.wires.per_length_phase_impedance import PerLengthPhaseImpedance
     from zepben.ewb.model.cim.iec61970.base.wires.per_length_sequence_impedance import PerLengthSequenceImpedance
 
diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source.py b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source.py
index 80e1ba64..5f8fdf13 100644
--- a/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source.py
+++ b/src/zepben/ewb/model/cim/iec61970/base/wires/energy_source.py
@@ -11,7 +11,6 @@
 
 from zepben.ewb.model.cim.iec61970.base.wires.energy_connection import EnergyConnection
 from zepben.ewb.util import nlen, get_by_mrid, ngen, safe_remove, require
-from zepben.ewb.util import nlen, get_by_mrid, ngen, safe_remove
 from zepben.ewb.dataclass_descriptors.dataclass_base import zb_dataclass
 
 if TYPE_CHECKING:
diff --git a/test/cim/iec61968/metering/test_usage_point.py b/test/cim/iec61968/metering/test_usage_point.py
index b70f6115..59c31945 100644
--- a/test/cim/iec61968/metering/test_usage_point.py
+++ b/test/cim/iec61968/metering/test_usage_point.py
@@ -8,7 +8,7 @@
 from cim.fill_fields import usage_point_kwargs
 from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \
     verify_identified_object_constructor_kwargs
-from cim.private_collection_validator import validate_unordered, validate_unordered_other
+from cim.private_collection_validator import validate_unordered
 from util import assert_or_empty
 from zepben.ewb import Equipment, generate_id
 from zepben.ewb.model.cim.extensions.iec61968.common.contact_details import ContactDetails
diff --git a/test/cim/private_collection_validator.py b/test/cim/private_collection_validator.py
index 84d2634b..faa24e46 100644
--- a/test/cim/private_collection_validator.py
+++ b/test/cim/private_collection_validator.py
@@ -5,7 +5,6 @@
 import re
 from collections import Counter
 from enum import Enum
-from types import MemberDescriptorType
 from typing import TypeVar, Callable, Generator, List, Dict, Union, Type, Tuple, Any, Protocol
 
 import pytest