diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 15596c3e..022a59ba 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -173,8 +173,6 @@ def show_config_callback(option, opt, value, parser):
     overrides = getattr(parser.values, 'overrides', [])
 
     extensions = ext.load_extensions()
-    enabled_extensions = []
-
     config, errors = config_lib.load(files, extensions, overrides)
 
     # Clear out any config for disabled extensions.
diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py
index 1cdcfa9b..6438f975 100644
--- a/mopidy/config/__init__.py
+++ b/mopidy/config/__init__.py
@@ -4,7 +4,6 @@ import ConfigParser as configparser
 import io
 import logging
 import os.path
-import sys
 
 from mopidy.config.schemas import *
 from mopidy.config.types import *
diff --git a/mopidy/config/schemas.py b/mopidy/config/schemas.py
index 9f10c41f..ba91161c 100644
--- a/mopidy/config/schemas.py
+++ b/mopidy/config/schemas.py
@@ -4,6 +4,9 @@ import collections
 
 from mopidy.config import types
 
+# TODO: 2.6 cleanup (#344).
+ordered_dict = getattr(collections, 'OrderedDict', dict)
+
 
 def _did_you_mean(name, choices):
     """Suggest most likely setting based on levenshtein."""
@@ -88,7 +91,7 @@ class ConfigSchema(object):
         return result, errors
 
     def serialize(self, values, display=False):
-        result = getattr(collections, 'OrderedDict', dict)() # TODO: 2.6 cleanup
+        result = ordered_dict()  # TODO: 2.6 cleanup (#344).
         for key in self._order:
             if key in values:
                 result[key] = self._schema[key].serialize(values[key], display)
@@ -131,7 +134,7 @@ class LogLevelConfigSchema(object):
         return result, errors
 
     def serialize(self, values, display=False):
-        result = getattr(collections, 'OrderedDict', dict)() # TODO: 2.6 cleanup
+        result = ordered_dict()  # TODO: 2.6 cleanup (#344)
         for key in sorted(values.keys()):
             result[key] = self._config_value.serialize(values[key], display)
         return result