diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideViewModel.kt
index b70d2d3cc..13744d4d3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/hide/HideViewModel.kt
@@ -82,12 +82,8 @@ class HideViewModel(
     // ---
 
     override fun submitQuery() {
-        if (!queryHandler.hasCallbacks(queryRunnable)) {
-            queryHandler.post(queryRunnable)
-        } else {
-            queryHandler.removeCallbacks(queryRunnable)
-            queryHandler.postDelayed(queryRunnable, queryDelay)
-        }
+        queryHandler.removeCallbacks(queryRunnable)
+        queryHandler.postDelayed(queryRunnable, queryDelay)
     }
 
     private fun query(
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt
index 494b9f4ed..84648a5be 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt
@@ -165,12 +165,8 @@ class ModuleViewModel(
     // ---
 
     override fun submitQuery() {
-        if (!queryHandler.hasCallbacks(queryRunnable)) {
-            queryHandler.post(queryRunnable)
-        } else {
-            queryHandler.removeCallbacks(queryRunnable)
-            queryHandler.postDelayed(queryRunnable, queryDelay)
-        }
+        queryHandler.removeCallbacks(queryRunnable)
+        queryHandler.postDelayed(queryRunnable, queryDelay)
     }
 
     private fun queryInternal(query: String, offset: Int): Single<List<RepoItem>> {
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
index 69462e5bd..fc10e2410 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
@@ -17,7 +17,6 @@ import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.animation.doOnEnd
 import androidx.core.view.*
-import androidx.core.widget.NestedScrollView
 import androidx.databinding.BindingAdapter
 import androidx.databinding.InverseBindingAdapter
 import androidx.databinding.InverseBindingListener
@@ -427,18 +426,6 @@ fun Chip.setOnCloseClickedListenerBinding(listener: View.OnClickListener) {
     setOnCloseIconClickListener(listener)
 }
 
-@BindingAdapter("onScrollStateChanged")
-fun NestedScrollView.setOnScrollStateChangeListener(listener: Runnable) {
-    setOnScrollChangeListener { _: NestedScrollView?, _: Int, _: Int, _: Int, _: Int ->
-        if (!handler.hasCallbacks(listener)) {
-            listener.run()
-        } else {
-            handler.removeCallbacksAndMessages(null)
-        }
-        handler.postDelayed(listener, 1000)
-    }
-}
-
 @BindingAdapter("progressAnimated")
 fun ProgressBar.setProgressAnimated(newProgress: Int) {
     val animator = tag as? ValueAnimator