diff --git a/src/revpi_middleware/cli_commands/cli_base.py b/src/revpi_middleware/cli_commands/cli_base.py
index c57f277..19def6a 100644
--- a/src/revpi_middleware/cli_commands/cli_base.py
+++ b/src/revpi_middleware/cli_commands/cli_base.py
@@ -5,12 +5,11 @@
 This module provides the foundation for the RevPi middleware CLI commands
 and argument parsing setup.
 """
-from argparse import ArgumentParser
 from logging import getLogger
 
-from revpi_middleware.cli_commands import cli_picontrol
-from revpi_middleware.proginit import StdLogOutput
+from . import cli_config, cli_picontrol
 from .. import proginit as pi
+from ..proginit import StdLogOutput
 
 log = getLogger(__name__)