diff --git a/apps/converter/api.py b/apps/converter/api.py
index a712e1c438..3a5b855ada 100644
--- a/apps/converter/api.py
+++ b/apps/converter/api.py
@@ -2,14 +2,12 @@ import os
 import subprocess
 import hashlib
 
-from common import TEMPORARY_DIRECTORY
-from documents.utils import document_save_to_temp_dir
+from common.conf.settings import TEMPORARY_DIRECTORY
 
 from converter.conf.settings import UNOCONV_PATH
 from converter.exceptions import OfficeConversionError
 from converter.literals import DEFAULT_PAGE_NUMBER, \
-    QUALITY_DEFAULT, DEFAULT_ZOOM_LEVEL, \
-    DEFAULT_ROTATION, DEFAULT_FILE_FORMAT, QUALITY_HIGH
+    DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, DEFAULT_FILE_FORMAT
 
 from converter import backend
 from converter.literals import TRANSFORMATION_CHOICES
@@ -62,26 +60,19 @@ def convert_office_document(input_filepath):
     return None
 
 
-def convert_document(document, *args, **kwargs):
-    document_filepath = create_image_cache_filename(document.checksum, *args, **kwargs)
-    if os.path.exists(document_filepath):
-        return document_filepath
-
-    return convert(document_save_to_temp_dir(document, document.checksum), *args, **kwargs)
-
-
-def convert(input_filepath, cleanup_files=True, *args, **kwargs):
+def convert(input_filepath, output_filepath=None, cleanup_files=False, *args, **kwargs):
     size = kwargs.get('size')
     file_format = kwargs.get('file_format', DEFAULT_FILE_FORMAT)
     zoom = kwargs.get('zoom', DEFAULT_ZOOM_LEVEL)
     rotation = kwargs.get('rotation', DEFAULT_ROTATION)
     page = kwargs.get('page', DEFAULT_PAGE_NUMBER)
-    quality = kwargs.get('quality', QUALITY_DEFAULT)
     transformations = kwargs.get('transformations', [])
 
     unoconv_output = None
 
-    output_filepath = create_image_cache_filename(input_filepath, *args, **kwargs)
+    if output_filepath is None:
+        output_filepath = create_image_cache_filename(input_filepath, *args, **kwargs)
+        
     if os.path.exists(output_filepath):
         return output_filepath
 
@@ -117,7 +108,7 @@ def convert(input_filepath, cleanup_files=True, *args, **kwargs):
         )           
 
     try:
-        backend.convert_file(input_filepath=input_filepath, output_filepath=output_filepath, quality=quality, transformations=transformations, page=page, file_format=file_format)
+        backend.convert_file(input_filepath=input_filepath, output_filepath=output_filepath, transformations=transformations, page=page, file_format=file_format)
     finally:
         if cleanup_files:
             cleanup(input_filepath)
diff --git a/apps/documents/utils.py b/apps/documents/utils.py
index 0c8122bcbc..32658d5f43 100644
--- a/apps/documents/utils.py
+++ b/apps/documents/utils.py
@@ -1,6 +1,6 @@
 import os
 
-from common import TEMPORARY_DIRECTORY
+from common.conf.settings import TEMPORARY_DIRECTORY
 
 
 #http://stackoverflow.com/questions/123198/how-do-i-copy-a-file-in-python