diff --git a/labgrid/driver/httpvideodriver.py b/labgrid/driver/httpvideodriver.py
index 6d0f2219a..b327039cd 100644
--- a/labgrid/driver/httpvideodriver.py
+++ b/labgrid/driver/httpvideodriver.py
@@ -1,7 +1,8 @@
 # pylint: disable=no-member
 import subprocess
+from urllib.parse import urlsplit
+
 import attr
-from urllib.parse import urlsplit, urlunsplit
 
 from .common import Driver
 from ..factory import target_factory
diff --git a/labgrid/driver/shelldriver.py b/labgrid/driver/shelldriver.py
index 7f8f0b83f..201b07bc9 100644
--- a/labgrid/driver/shelldriver.py
+++ b/labgrid/driver/shelldriver.py
@@ -4,7 +4,6 @@
 import io
 import logging
 import re
-import time
 import shlex
 import ipaddress
 
diff --git a/labgrid/remote/client.py b/labgrid/remote/client.py
index 83cd01efb..626cd8868 100755
--- a/labgrid/remote/client.py
+++ b/labgrid/remote/client.py
@@ -2,7 +2,6 @@
 coordinator, acquire a place and interact with the connected resources"""
 import argparse
 import asyncio
-import atexit
 import contextlib
 import enum
 import os