diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerAddScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerAddScreen.kt
deleted file mode 100644
index 7cb6a8f..0000000
--- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerAddScreen.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package be.ugent.sel.studeez.screens.timer_add
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.tooling.preview.Preview
-import be.ugent.sel.studeez.common.composable.SecondaryScreenTemplate
-import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo
-import be.ugent.sel.studeez.screens.timer_edit.GetTimerEditScreen
-import be.ugent.sel.studeez.screens.timer_edit.TimerEditViewModel
-import be.ugent.sel.studeez.screens.timer_edit.editScreens.AbstractTimerEditScreen
-import be.ugent.sel.studeez.ui.theme.StudeezTheme
-
-data class TimerEditActions(
-    val getTimerInfo: () -> TimerInfo,
-    val saveTimer: (TimerInfo, () -> Unit) -> Unit
-)
-
-fun getTimerEditActions(
-    viewModel: TimerEditViewModel,
-    open: (String) -> Unit
-): TimerEditActions {
-    return TimerEditActions(
-        getTimerInfo = viewModel::getTimerInfo,
-        saveTimer = viewModel::saveTimer
-    )
-}
-
-@Composable
-fun TimerEditRoute(
-    open: (String) -> Unit,
-    popUp: () -> Unit,
-    viewModel: TimerEditViewModel,
-) {
-
-    val timerEditActions = getTimerEditActions(viewModel, open)
-
-    SecondaryScreenTemplate(title = "Edit Timer", popUp = popUp) {
-
-        val timerEditScreen = timerEditActions.getTimerInfo().accept(GetTimerEditScreen())
-        timerEditScreen { timerInfo ->
-            timerEditActions.saveTimer(timerInfo, popUp)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerAddViewModel.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerAddViewModel.kt
deleted file mode 100644
index 9ab766c..0000000
--- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerAddViewModel.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package be.ugent.sel.studeez.screens.timer_add
-
-import be.ugent.sel.studeez.data.EditTimerState
-import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo
-import be.ugent.sel.studeez.domain.LogService
-import be.ugent.sel.studeez.domain.TimerDAO
-import be.ugent.sel.studeez.screens.StudeezViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-
-@HiltViewModel
-class TimerAddViewModel @Inject constructor(
-    private val editTimerState: EditTimerState,
-    private val timerDAO: TimerDAO,
-    logService: LogService
-) : StudeezViewModel(logService) {
-
-    private val timerInfo: TimerInfo = editTimerState.timerInfo
-
-    fun getTimerInfo(): TimerInfo {
-        return timerInfo
-    }
-
-    fun saveTimer(timerInfo: TimerInfo, goBack: () -> Unit) {
-        timerDAO.updateTimer(timerInfo)
-        goBack()
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerTypeSelectScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerTypeSelectScreen.kt
index d14bb86..f950c23 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerTypeSelectScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerTypeSelectScreen.kt
@@ -34,7 +34,8 @@ fun TimerTypeSelectScreen(
             modifier = Modifier.fillMaxWidth()
         ) {
             TimerType.values().forEach { timerType ->
-                Button(onClick = { viewModel.onTimerTypeChosen(defaultTimerInfo[timerType]!!, open) }) {
+                val default: TimerInfo = defaultTimerInfo.getValue(timerType)
+                Button(onClick = { viewModel.onTimerTypeChosen(default, open) }) {
                     Text(text = timerType.name)
                 }
             }
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerTypeSelectViewModel.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerTypeSelectViewModel.kt
index 1892833..11b512d 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerTypeSelectViewModel.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_add/TimerTypeSelectViewModel.kt
@@ -13,7 +13,6 @@ import javax.inject.Inject
 @HiltViewModel
 class TimerTypeSelectViewModel @Inject constructor(
     private val editTimerState: EditTimerState,
-    private val timerDAO: TimerDAO,
     logService: LogService
 ) : StudeezViewModel(logService) {