diff --git a/app/experiment/views.py b/app/experiment/views.py
index 623b1fc6a6e78ec5c39a8adfdf63eedeac6fea62..d365138eb3100a8687975007133c03b8dedf8c81 100644
--- a/app/experiment/views.py
+++ b/app/experiment/views.py
@@ -1,38 +1,29 @@
 
-
-from app import socketio
-from flask_socketio import emit
-import embody_plot
 import os
 import secrets
-import json
-from datetime import datetime, date
+from datetime import date
 
+from flask_socketio import emit
+from sqlalchemy import and_
+from flask_login import login_required
+from werkzeug import secure_filename
 from flask import (
-    Flask,
     render_template,
     request,
-    session,
     flash,
     redirect,
     url_for,
-    Blueprint,
-    jsonify
+    Blueprint
 )
 
-from wtforms import Form
-from sqlalchemy import and_, update
-from flask_login import login_required
-from werkzeug import secure_filename
-
-from app import app, db
+from app import app, db, socketio
 from app.routes import APP_ROOT
 from app.models import background_question, experiment
 from app.models import background_question_answer
 from app.models import page, question
 from app.models import background_question_option
 from app.models import answer_set, answer, forced_id
-from app.models import user, trial_randomization
+from app.models import trial_randomization
 from app.models import embody_answer, embody_question
 from app.forms import (
     CreateBackgroundQuestionForm,
@@ -41,7 +32,9 @@ from app.forms import (
     EditPageForm, RemoveExperimentForm, GenerateIdForm, CreateEmbodyForm
 )
 from app.utils import get_mean_from_slider_answers, map_answers_to_questions, \
-    saved_data_as_file, timeit, generate_csv 
+    generate_csv
+
+import embody_plot
 
 # Stimuli upload folder setting
 #APP_ROOT = os.path.dirname(os.path.abspath(__file__))
diff --git a/app/routes.py b/app/routes.py
index 34902a0d596e4ea088fc1bf6d7ad2e157653c8ce..9d64ba14306b391f4546579683f54c383f1e1b8f 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,8 +1,7 @@
 import os
 import random
 import secrets
-from datetime import datetime, date
-import json
+from datetime import datetime
 
 from flask import (render_template,
                    request,
@@ -16,9 +15,9 @@ from flask_login import current_user, login_user, logout_user, login_required
 from app import app, db
 from app.models import background_question, experiment
 from app.models import background_question_answer
-from app.models import page, question, embody_question, embody_answer
+from app.models import page
 from app.models import background_question_option
-from app.models import answer_set, answer, forced_id
+from app.models import answer_set, forced_id
 from app.models import user, trial_randomization
 from app.forms import LoginForm, RegisterForm, StartWithIdForm
 
diff --git a/app/static/js/getCSV.js b/app/static/js/getCSV.js
index a2d3463b915bd3d5db2b162dad7b86dd989ff64d..f8416028ed65dd460a5f64653fa78a8094cdfe17 100644
--- a/app/static/js/getCSV.js
+++ b/app/static/js/getCSV.js
@@ -21,17 +21,18 @@ $(document).ready(function()  {
         });
 
         socket.on('progress', function(data) {
-            console.log(data)
             progressBar.width(100*(data.done/data.from) + '%')
         });
 
         socket.on('timeout', function(data) {
-            console.log("timeout error", data.exc)
+            // kill connection
             socket.disconnect()            
+
             exportButton.text('Export results')
             exportButton.removeClass('disabled')
             progressBarContainer.addClass("hidden")
 
+            // show error
             exportLinkContainer.removeClass("hidden")
             exportError.text('Error: ' + data.exc)
         });
@@ -41,18 +42,18 @@ $(document).ready(function()  {
 
             exportButton.text('File is ready!')
 
+            // show link
             exportLinkContainer.removeClass("hidden")
+            exportLink.text('Download: ' + file.filename + '.csv')
 
+            // set filename to exportlink
             var href = exportLink.attr('href');
-
             href += '&path=' + file.path
             $(exportLink).attr('href', href);
 
             // Remove progress bar
             progressBarContainer.addClass("hidden")
             progressBar.width('0%')
-
-            exportLink.text('Download: ' + file.filename + '.csv')
         });
     }
 
@@ -64,11 +65,9 @@ $(document).ready(function()  {
         var socket = io.connect(exportURL);
         initConnection(socket)
 
+        // start generating csv file...
         socket.emit('generate_csv', {exp_id: this.dataset.value})
 
         progressBarContainer.removeClass("hidden")
-
     })
-
-
 })
diff --git a/app/static/js/getDrawing.js b/app/static/js/getDrawing.js
index 9f349fbdff38d2d08857b87198d85cb45577f2af..98d80c0bcbd2244a4a60def4f76c4e2041ff3cbc 100644
--- a/app/static/js/getDrawing.js
+++ b/app/static/js/getDrawing.js
@@ -40,37 +40,13 @@ $(document).ready(function()  {
         var socket = io.connect(getDrawingURI);
         initConnection(socket)
 
-        // 
         var pageId = this.dataset.value.split('-')[0]
         var embodyId = this.dataset.value.split('-')[1]
 
-        console.log(pageId)
-        console.log(embodyId)
-
-
         socket.emit('draw', {page:pageId, embody:embodyId})
         progressBarContainer.removeClass("hidden")
 
         scrollTo('plotted-image')
-
-        /*
-        With AJAX -calls
-        var spinner = $(event.target.firstElementChild)
-        spinner.removeClass("hidden")
-
-        $.ajax({
-            url: getDrawingURI,
-            method: 'POST',
-            data: {page:pageId}
-        }).done(function(data) {
-            var source = JSON.parse(data).path;
-            console.log(source)
-            d = new Date()
-            imageContainer.attr("src", "/static/" + source + "?" +d.getTime())
-            spinner.addClass("hidden")
-        })
-        */
-
     })
 
     function scrollTo(hash) {
@@ -78,5 +54,4 @@ $(document).ready(function()  {
             'scrollTop':   $('#'+hash).offset().top - 250
         }, 500);
     }
-
 })
diff --git a/config.py b/config.py
index eced748970d173cace8a0c38315494b997777065..e172252332a1ef62dc7423389cb733f32bea3927 100644
--- a/config.py
+++ b/config.py
@@ -39,4 +39,4 @@ class Config(object):
 
     TEMPLATES_AUTO_RELOAD = True
 
-    DEBUG = True
+    DEBUG = False