diff --git a/.drone.yml b/.drone.yml
index d4897d8..15566d8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,8 +7,3 @@ steps:
   commands:
   - gradle test
 
-- name: test-jdk8
-  image: gradle:jdk8
-  commands:
-  - gradle test
-
diff --git a/build.gradle b/build.gradle
index 819b96d..8e7f571 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,10 +42,10 @@ dependencies {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 
 group 'org.mosad'
diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt
index e6a2a64..fd3466a 100644
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt
@@ -128,14 +128,7 @@ class CacheController {
             // get all lessons from the weeks timetable
             val flatMap = getTimetable(courseName, weekIndex).timetable.days.flatMap { it.timeslots.asIterable() }
             flatMap.forEach {
-                // TODO Java 11
-                //it.stream().filter { x -> x.lessonSubject.contains(lessonSubject) }.findAny().ifPresent { x -> println("${x.lessonSubject}, ${x.lessonTeacher}") }
-
-                it.forEach { lesson ->
-                    if(lesson.lessonSubject.contains(lessonSubject)) {
-                        lessonList.add(lesson)
-                    }
-                }
+                it.stream().filter { x -> x.lessonSubject.contains(lessonSubject) }.findAny().ifPresent { x -> lessonList.add(x) }
             }
 
             return lessonList
diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt
index 5446c7d..06aa7d3 100644
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt
@@ -56,18 +56,11 @@ class StatusController {
          * if a timetable is requested update the request counter
          */
         fun updateTimetableRequests(courseName: String) {
-            when (timetableRequests.stream().filter { x -> x.courseName == courseName }.findAny().orElse(null)) {
-                null -> timetableRequests.add(TimetableCounter(courseName, 0))
-            }
-            timetableRequests.stream().filter { x -> x.courseName == courseName }.findFirst()
-                .ifPresent { x -> x.requests++ }
-
-            // TODO Java 11
-//        timetableRequests.stream().filter { it.courseName == courseName }.findFirst().ifPresentOrElse({
-//            it.requests++
-//        }, {
-//
-//        })
+            timetableRequests.stream().filter { it.courseName == courseName }.findFirst().ifPresentOrElse({
+                it.requests++
+            }, {
+                timetableRequests.add(TimetableCounter(courseName, 1))
+            })
         }
 
         fun getTotalRequests(): Int {