diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt
index 2f7a22ddd..2964850eb 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt
@@ -7,7 +7,6 @@ import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ChatroomKeyable
-import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
 class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
@@ -50,7 +49,6 @@ class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Not
             .reversed()
     }
 
-    @OptIn(ExperimentalTime::class)
     override fun updateListWith(oldList: List<Note>, newItems: Set<Note>): List<Note> {
         val (feed, elapsed) = measureTimedValue {
             val me = account.userProfile()
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt
index 7b5b8b9b4..7356b3544 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt
@@ -6,7 +6,6 @@ import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ChatroomKeyable
 import com.vitorpamplona.quartz.events.PrivateDmEvent
-import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
 class ChatroomListNewFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
@@ -38,7 +37,6 @@ class ChatroomListNewFeedFilter(val account: Account) : AdditiveFeedFilter<Note>
             .reversed()
     }
 
-    @OptIn(ExperimentalTime::class)
     override fun updateListWith(oldList: List<Note>, newItems: Set<Note>): List<Note> {
         val (feed, elapsed) = measureTimedValue {
             val me = account.userProfile()
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/FeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/FeedFilter.kt
index 86f8bd3aa..1b86baca3 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/FeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/FeedFilter.kt
@@ -2,11 +2,9 @@ package com.vitorpamplona.amethyst.ui.dal
 
 import android.util.Log
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
 abstract class FeedFilter<T> {
-    @OptIn(ExperimentalTime::class)
     fun loadTop(): List<T> {
         checkNotInMainThread()
 
@@ -33,7 +31,6 @@ abstract class AdditiveFeedFilter<T> : FeedFilter<T>() {
     abstract fun applyFilter(collection: Set<T>): Set<T>
     abstract fun sort(collection: Set<T>): List<T>
 
-    @OptIn(ExperimentalTime::class)
     open fun updateListWith(oldList: List<T>, newItems: Set<T>): List<T> {
         checkNotInMainThread()
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
index 04d8a249c..4d521730a 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
@@ -34,7 +34,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
 @Stable
@@ -270,7 +269,6 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
     private val bundler = BundledUpdate(1000, Dispatchers.IO)
     private val bundlerInsert = BundledInsert<Set<Note>>(1000, Dispatchers.IO)
 
-    @OptIn(ExperimentalTime::class)
     fun invalidateData(ignoreIfDoing: Boolean = false) {
         bundler.invalidate(ignoreIfDoing) {
             // adds the time to perform the refresh into this delay
@@ -282,7 +280,6 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
         }
     }
 
-    @OptIn(ExperimentalTime::class)
     fun invalidateDataAndSendToTop() {
         clear()
         bundler.invalidate(false) {
@@ -296,7 +293,6 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
         }
     }
 
-    @OptIn(ExperimentalTime::class)
     fun checkKeysInvalidateDataAndSendToTop() {
         if (lastFeedKey != localFilter.feedKey()) {
             clear()
@@ -312,7 +308,6 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
         }
     }
 
-    @OptIn(ExperimentalTime::class)
     fun invalidateInsertData(newItems: Set<Note>) {
         bundlerInsert.invalidateList(newItems) {
             val newObjects = it.flatten().toSet()