diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py
index 80762c89..2a06ca61 100644
--- a/mopidy/backends/local/__init__.py
+++ b/mopidy/backends/local/__init__.py
@@ -1,6 +1,5 @@
 import glob
 import logging
-import multiprocessing
 import os
 import shutil
 
diff --git a/mopidy/core.py b/mopidy/core.py
index e21efd00..78f0dd6c 100644
--- a/mopidy/core.py
+++ b/mopidy/core.py
@@ -1,5 +1,4 @@
 import logging
-import multiprocessing
 import optparse
 import sys
 
diff --git a/mopidy/frontends/mpd/protocol/status.py b/mopidy/frontends/mpd/protocol/status.py
index 87d58f89..a78efc0a 100644
--- a/mopidy/frontends/mpd/protocol/status.py
+++ b/mopidy/frontends/mpd/protocol/status.py
@@ -92,8 +92,7 @@ def stats(frontend):
         'artists': 0, # TODO
         'albums': 0, # TODO
         'songs': 0, # TODO
-        # TODO Does not work after multiprocessing branch merge
-        'uptime': 0, # frontend.session.stats_uptime(),
+        'uptime': 0, # TODO
         'db_playtime': 0, # TODO
         'db_update': 0, # TODO
         'playtime': 0, # TODO
diff --git a/mopidy/frontends/mpd/session.py b/mopidy/frontends/mpd/session.py
index 78e6f624..5a473eca 100644
--- a/mopidy/frontends/mpd/session.py
+++ b/mopidy/frontends/mpd/session.py
@@ -1,6 +1,5 @@
 import asynchat
 import logging
-import multiprocessing
 
 from mopidy import settings
 from mopidy.frontends.mpd.dispatcher import MpdDispatcher
diff --git a/mopidy/mixers/nad.py b/mopidy/mixers/nad.py
index e12b8b92..3d279736 100644
--- a/mopidy/mixers/nad.py
+++ b/mopidy/mixers/nad.py
@@ -1,6 +1,5 @@
 import logging
-from serial import Serial
-from multiprocessing import Pipe
+import serial
 
 from pykka.actor import ThreadingActor
 
@@ -84,8 +83,8 @@ class NadTalker(ThreadingActor):
         # Communication settings: 115200 bps 8N1
         logger.info(u'Connecting to serial device "%s"',
             settings.MIXER_EXT_PORT)
-        self._device = Serial(port=settings.MIXER_EXT_PORT, baudrate=115200,
-            timeout=self.TIMEOUT)
+        self._device = serial.Serial(port=settings.MIXER_EXT_PORT,
+            baudrate=115200, timeout=self.TIMEOUT)
         self._get_device_model()
 
     def _set_device_to_known_state(self):