diff --git a/Dockerfile b/Dockerfile
index a4c4ff8..ed49c85 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,12 +12,15 @@ RUN mkdir /files/cache/waveforms
 RUN mkdir /files/tmp
 
 WORKDIR /code
+
 ADD requirements.txt /code/
-RUN pip install -r requirements.txt
+ADD . /code/
+
 RUN apt-get update && apt-get install -y sox lame vim \
     libboost-program-options-dev libsox-fmt-mp3 postgresql-client rsync openssh-client
 
-ADD . /code/
+RUN pip uninstall azure
+RUN pip install -r requirements.txt
 
 RUN adduser --disabled-password --gecos '' djworker
 RUN chown djworker /files -R
diff --git a/core/utils/cdn.py b/core/utils/cdn.py
index f8f6def..ceabb6a 100755
--- a/core/utils/cdn.py
+++ b/core/utils/cdn.py
@@ -1,9 +1,5 @@
-import os
-
 from azure import WindowsAzureMissingResourceError
 from azure.storage import BlobService
-from libcloud.storage.types import Provider
-from libcloud.storage.providers import get_driver
 
 from dss import settings
 from dss.storagesettings import AZURE_ACCOUNT_NAME, AZURE_ACCOUNT_KEY, AZURE_CONTAINER