diff --git a/start.sh b/start.sh
index 250be13ea..94a0392e3 100755
--- a/start.sh
+++ b/start.sh
@@ -2,7 +2,6 @@
 
 
 create_env() {
-    echo "[ENV FILE] creating .env file..."
     # check if file exists
     if [ -f "/var/interlegis/sapl/data/secret.key" ]; then
         KEY=`cat /var/interlegis/sapl/data/secret.key`
@@ -11,6 +10,7 @@ create_env() {
         echo $KEY > data/secret.key
     fi
 
+    # TODO: rename env-test-bash to .env
     FILENAME="/var/interlegis/sapl/sapl/.env"
 
     if [ -z "${DATABASE_URL:-}" ]; then
@@ -34,11 +34,13 @@ create_env() {
     echo "EMAIL_HOST = ""${EMAIL_HOST-''}" >> $FILENAME
     echo "EMAIL_HOST_USER = ""${EMAIL_HOST_USER-''}" >> $FILENAME
     echo "EMAIL_HOST_PASSWORD = ""${EMAIL_HOST_PASSWORD-''}" >> $FILENAME
-
-    echo "[ENV FILE] done."
 }
 
+echo "creating .env file..."
 create_env
+echo "done."
+
+# # python3 gen-env.py
 
 python3 manage.py bower install
 
@@ -46,24 +48,6 @@ python3 manage.py bower install
 
 python3 manage.py migrate
 python3 manage.py collectstatic --no-input
-python3 manage.py rebuild_index --noinput
-
-user_created=$(python3 create_admin.py 2>&1)
-
-cmd=$(echo $user_created | grep 'ADMIN_USER_EXISTS')
-user_exists=$?
-
-cmd=$(echo $user_created | grep 'MISSING_ADMIN_PASSWORD')
-lack_pwd=$?
-
-if [ $user_exists -eq 0 ]; then
-   echo "[SUPERUSER CREATION] User admin already exists. Not creating"
-fi  
- 
-if [ $lack_pwd -eq 0 ]; then
-   echo "[SUPERUSER] Environment variable $ADMIN_PASSWORD for superuser admin was not set. Leaving container"
-   # return -1
-fi 
-
+python3 manage.py rebuild_index --noinput &
 
-/bin/sh gunicorn_start.sh no-venv
+/bin/sh gunicorn_start.sh