diff --git a/lib/tfw/builtins/frontend_event_handler.py b/lib/tfw/builtins/frontend_event_handler.py
index d3fe91e..1a76abe 100644
--- a/lib/tfw/builtins/frontend_event_handler.py
+++ b/lib/tfw/builtins/frontend_event_handler.py
@@ -1,9 +1,10 @@
 from abc import ABC, abstractmethod
 from contextlib import suppress
 
-from tfw.builtins.message_sender import MessageSender
 from tfw.event_handlers import FrontendEventHandlerBase
 
+from .message_sender import MessageSender
+
 
 class FrontendEventHandler(FrontendEventHandlerBase):
     def __init__(self):
diff --git a/lib/tfw/builtins/ide_event_handler.py b/lib/tfw/builtins/ide_event_handler.py
index f4025b0..e397874 100644
--- a/lib/tfw/builtins/ide_event_handler.py
+++ b/lib/tfw/builtins/ide_event_handler.py
@@ -4,7 +4,7 @@
 import logging
 
 from tfw.networking import Scope
-from tfw.event_handlers import FrontendEventHandlerBase, TFWServerUplinkConnector
+from tfw.event_handlers import FrontendEventHandlerBase
 from tfw.components import FileManager
 from tfw.components.inotify import InotifyObserver
 
diff --git a/lib/tfw/builtins/log_monitoring_event_handler.py b/lib/tfw/builtins/log_monitoring_event_handler.py
index f1d2919..d2ce529 100644
--- a/lib/tfw/builtins/log_monitoring_event_handler.py
+++ b/lib/tfw/builtins/log_monitoring_event_handler.py
@@ -3,9 +3,8 @@
 
 import logging
 
-from os.path import dirname
 from tfw.networking import Scope
-from tfw.event_handlers import FrontendEventHandlerBase, TFWServerUplinkConnector
+from tfw.event_handlers import FrontendEventHandlerBase
 from tfw.components.inotify import InotifyObserver
 from tfw.mixins.supervisor_mixin import SupervisorLogMixin
 
@@ -24,7 +23,7 @@ class LogInotifyObserver(InotifyObserver, SupervisorLogMixin):
     @property
     def process_name(self):
         return self._process_name
-    
+
     @process_name.setter
     def process_name(self, process_name):
         self._process_name = process_name
diff --git a/lib/tfw/components/file_manager/test_file_manager.py b/lib/tfw/components/file_manager/test_file_manager.py
index 33c8024..380da0a 100644
--- a/lib/tfw/components/file_manager/test_file_manager.py
+++ b/lib/tfw/components/file_manager/test_file_manager.py
@@ -9,7 +9,7 @@ from tempfile import TemporaryDirectory
 
 import pytest
 
-from file_manager import FileManager
+from .file_manager import FileManager
 
 @dataclass
 class ManagerContext:
diff --git a/lib/tfw/components/history_monitor.py b/lib/tfw/components/history_monitor.py
index 703a68f..d8c5587 100644
--- a/lib/tfw/components/history_monitor.py
+++ b/lib/tfw/components/history_monitor.py
@@ -5,13 +5,11 @@ from pwd import getpwnam
 from grp import getgrnam
 from pathlib import Path
 from os import chown
-from os.path import dirname
 from re import findall
 from re import compile as compileregex
 from abc import ABC, abstractmethod
 
 from tfw.components.inotify import InotifyObserver
-from tfw.event_handlers import TFWServerUplinkConnector
 
 
 class HistoryMonitor(ABC, InotifyObserver):