diff --git a/schoolapps/schoolapps/urls.py b/schoolapps/schoolapps/urls.py
index 37d959fb975f87bd69ce93480975b0c83ce3a881..88c4c2a93fc6a9e1aceff348273939a6f46e4d8e 100755
--- a/schoolapps/schoolapps/urls.py
+++ b/schoolapps/schoolapps/urls.py
@@ -35,11 +35,6 @@ urlpatterns = [
                   #######
                   path('aub/', include('aub.urls')),
 
-                  #################
-                  # UNTIS CONNECT #
-                  #################
-                  path('untis/', include('untisconnect.urls')),
-
                   #############
                   # TIMETABLE #
                   #############
@@ -48,7 +43,7 @@ urlpatterns = [
                   #########
                   # Admin #
                   #########
-                path('settings/', include('dbsettings.urls')),
+                  path('settings/', include('dbsettings.urls')),
                   path('admin/', admin.site.urls),
               ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 
diff --git a/schoolapps/timetable/views.py b/schoolapps/timetable/views.py
index f03f66a3b0dded4d34df7e794937c9cd1ad485b7..842d013189c524cbabc920ddfb031e4173ecf89c 100755
--- a/schoolapps/timetable/views.py
+++ b/schoolapps/timetable/views.py
@@ -1,8 +1,7 @@
 from django.contrib.auth.decorators import login_required
 from django.http import Http404
 from django.shortcuts import render
-from untisconnect.api import *
-from .parse import *
+from untisconnect.parse import *
 
 try:
     from schoolapps.untisconnect.api import *
diff --git a/schoolapps/untisconnect/admin.py b/schoolapps/untisconnect/admin.py
deleted file mode 100755
index 8c38f3f3dad51e4585f3984282c2a4bec5349c1e..0000000000000000000000000000000000000000
--- a/schoolapps/untisconnect/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/schoolapps/timetable/parse.py b/schoolapps/untisconnect/parse.py
similarity index 98%
rename from schoolapps/timetable/parse.py
rename to schoolapps/untisconnect/parse.py
index 2bd372e3eb82c8434bf020f5c4e085ae6700525e..9c7b7cd5a3bf4e31fb82af615b8937ca3bf3472e 100755
--- a/schoolapps/timetable/parse.py
+++ b/schoolapps/untisconnect/parse.py
@@ -48,12 +48,7 @@ class LessonTime(object):
         self.rooms = rooms
 
 
-from untisconnect.api import *
-
-try:
-    from schoolapps.untisconnect.api import *
-except Exception:
-    pass
+from .api import *
 
 
 def clean_array(a, conv=None):
diff --git a/schoolapps/untisconnect/templates/untisconnect/test.html b/schoolapps/untisconnect/templates/untisconnect/test.html
deleted file mode 100755
index 3640a0c7cfbe984bd0d678eed49b507c150e40ff..0000000000000000000000000000000000000000
--- a/schoolapps/untisconnect/templates/untisconnect/test.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>UNTIS CONNECTING SYSTEM</h1>
-{{ teachers }}
-
-{% for teacher in teachers %}
-    <p>{{ teacher.first_name }} {{ teacher.name }}</p>
-{% endfor %}
\ No newline at end of file
diff --git a/schoolapps/untisconnect/tests.py b/schoolapps/untisconnect/tests.py
deleted file mode 100755
index 7ce503c2dd97ba78597f6ff6e4393132753573f6..0000000000000000000000000000000000000000
--- a/schoolapps/untisconnect/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/schoolapps/untisconnect/urls.py b/schoolapps/untisconnect/urls.py
deleted file mode 100755
index 193ccea9100ba506727b15886ea6c0a6f49f3fd3..0000000000000000000000000000000000000000
--- a/schoolapps/untisconnect/urls.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.urls import path
-from . import views
-
-urlpatterns = [
-    path('', views.test, name='untisconnect_test')
-]
diff --git a/schoolapps/untisconnect/views.py b/schoolapps/untisconnect/views.py
deleted file mode 100755
index f15e66c0186e448e4d970fa5a24338ed38802503..0000000000000000000000000000000000000000
--- a/schoolapps/untisconnect/views.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.contrib.auth.decorators import login_required
-from django.shortcuts import render
-
-
-# Create your views here.
-from .api import get_all_teachers, get_all_classes
-
-
-@login_required
-def test(request):
-    teachers = get_all_teachers()
-    classes = get_all_classes()
-    context = {
-        'teachers': teachers
-    }
-    return render(request, 'untisconnect/test.html', context=context)