diff --git a/etc/systemd/system/pandora-encoding.service b/etc/systemd/system/pandora-encoding.service
index fa791feb..b2a48626 100644
--- a/etc/systemd/system/pandora-encoding.service
+++ b/etc/systemd/system/pandora-encoding.service
@@ -7,16 +7,14 @@ Type=simple
 Restart=always
 User=pandora
 Group=pandora
-EnvironmentFile=/srv/pandora/pandora/encoding.conf
 PIDFile=/run/pandora/encoding.pid
 WorkingDirectory=/srv/pandora/pandora
 ExecStart=/srv/pandora/bin/celery \
     -A app worker \
     -Q encoding -n pandora-encoding \
     --pidfile /run/pandora/encoding.pid \
-    -c $CONCURRENCY \
-    --maxtasksperchild $MAX_TASKS_PER_CHILD \
-    -l $LOGLEVEL
+    --maxtasksperchild 500 \
+    -l INFO
 ExecReload=/bin/kill -TERM $MAINPID
 
 [Install]
diff --git a/etc/systemd/system/pandora-tasks.service b/etc/systemd/system/pandora-tasks.service
index d8fe1b58..19cf04af 100644
--- a/etc/systemd/system/pandora-tasks.service
+++ b/etc/systemd/system/pandora-tasks.service
@@ -7,16 +7,14 @@ Type=simple
 Restart=always
 User=pandora
 Group=pandora
-EnvironmentFile=/srv/pandora/pandora/tasks.conf
 PIDFile=/run/pandora/tasks.pid
 WorkingDirectory=/srv/pandora/pandora
 ExecStart=/srv/pandora/bin/celery \
     -A app worker \
     -Q default,celery -n pandora-default \
     --pidfile /run/pandora/tasks.pid \
-    -c $CONCURRENCY \
-    --maxtasksperchild $MAX_TASKS_PER_CHILD \
-    -l $LOGLEVEL
+    --maxtasksperchild 1000 \
+    -l INFO
 ExecReload=/bin/kill -TERM $MAINPID
 
 [Install]
diff --git a/pandora/app/views.py b/pandora/app/views.py
index 94e1c08c..60a173e2 100644
--- a/pandora/app/views.py
+++ b/pandora/app/views.py
@@ -59,11 +59,11 @@ def redirect_url(request, url):
     if settings.CONFIG['site'].get('sendReferrer', False):
         return redirect(url)
     else:
-        return HttpResponse('<script>document.location.href=%s;</script>' % json.dumps(url))
+        return HttpResponse('<script>document.location.href=%s;</script>'%json.dumps(url))
 
 def opensearch_xml(request):
     osd = ET.Element('OpenSearchDescription')
-    osd.attrib['xmlns'] = "http://a9.com/-/spec/opensearch/1.1/"
+    osd.attrib['xmlns']="http://a9.com/-/spec/opensearch/1.1/"
     e = ET.SubElement(osd, 'ShortName')
     e.text = settings.SITENAME
     e = ET.SubElement(osd, 'Description')
diff --git a/pandora/encoding.conf b/pandora/encoding.conf
deleted file mode 100644
index af15426c..00000000
--- a/pandora/encoding.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LOGLEVEL=info
-MAX_TASKS_PER_CHILD=500
-CONCURRENCY=1
diff --git a/pandora/tasks.conf b/pandora/tasks.conf
deleted file mode 100644
index 245a3562..00000000
--- a/pandora/tasks.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-LOGLEVEL=info
-MAX_TASKS_PER_CHILD=1000
-CONCURRENCY=2