diff --git a/ldclient/client.py b/ldclient/client.py
index f04b4d36..1bda5577 100644
--- a/ldclient/client.py
+++ b/ldclient/client.py
@@ -24,15 +24,7 @@
 from ldclient.impl.client_common import secure_mode_hash as _secure_mode_hash
 from ldclient.impl.datasource.feature_requester import FeatureRequesterImpl
 from ldclient.impl.datasource.polling import PollingUpdateProcessor
-from ldclient.impl.datasource.status import (
-    DataSourceStatusProviderImpl,
-    DataSourceUpdateSinkImpl
-)
 from ldclient.impl.datasource.streaming import StreamingUpdateProcessor
-from ldclient.impl.datastore.status import (
-    DataStoreStatusProviderImpl,
-    DataStoreUpdateSinkImpl
-)
 from ldclient.impl.datasystem import DataAvailability, DataSystem
 from ldclient.impl.datasystem.fdv2 import FDv2
 from ldclient.impl.evaluator import Evaluator, error_reason
@@ -43,7 +35,6 @@
 from ldclient.impl.events.event_processor import DefaultEventProcessor
 from ldclient.impl.events.types import EventFactory
 from ldclient.impl.flag_tracker import FlagTrackerImpl
-from ldclient.impl.listeners import Listeners
 from ldclient.impl.model.feature_flag import FeatureFlag
 from ldclient.impl.repeating_task import RepeatingTask
 from ldclient.impl.rwlock import ReadWriteLock
@@ -56,8 +47,7 @@
     DataStoreStatusProvider,
     DataStoreUpdateSink,
     FeatureStore,
-    FlagTracker,
-    ReadOnlyStore
+    FlagTracker
 )
 from ldclient.migrations import OpTracker, Stage
 from ldclient.plugin import EnvironmentMetadata
diff --git a/ldclient/impl/datasystem/fdv1.py b/ldclient/impl/datasystem/fdv1.py
index f21c3e6c..f6067e9d 100644
--- a/ldclient/impl/datasystem/fdv1.py
+++ b/ldclient/impl/datasystem/fdv1.py
@@ -18,14 +18,12 @@
     DataSystem,
     DiagnosticAccumulator
 )
-from ldclient.impl.flag_tracker import FlagTrackerImpl
 from ldclient.impl.listeners import Listeners
 from ldclient.impl.stubs import NullUpdateProcessor
 from ldclient.interfaces import (
     DataSourceStatusProvider,
     DataStoreStatusProvider,
     FeatureStore,
-    FlagTracker,
     ReadOnlyStore,
     UpdateProcessor
 )
diff --git a/ldclient/impl/datasystem/fdv2.py b/ldclient/impl/datasystem/fdv2.py
index 3359be3f..a316c3c3 100644
--- a/ldclient/impl/datasystem/fdv2.py
+++ b/ldclient/impl/datasystem/fdv2.py
@@ -1,7 +1,7 @@
 import time
 from queue import Queue
 from threading import Event, Thread
-from typing import Any, Callable, Dict, List, Optional
+from typing import List, Optional
 
 from ldclient.config import Config, DataSourceBuilder, DataSystemConfig
 from ldclient.impl.datasystem import (
@@ -17,7 +17,6 @@
     FeatureStoreClientWrapper
 )
 from ldclient.impl.datasystem.store import Store
-from ldclient.impl.flag_tracker import FlagTrackerImpl
 from ldclient.impl.listeners import Listeners
 from ldclient.impl.repeating_task import RepeatingTask
 from ldclient.impl.rwlock import ReadWriteLock
@@ -31,11 +30,9 @@
     DataStoreMode,
     DataStoreStatus,
     DataStoreStatusProvider,
-    FlagTracker,
     ReadOnlyStore,
     Synchronizer
 )
-from ldclient.versioned_data_kind import VersionedDataKind
 
 
 class FDv2(DataSystem):