diff --git a/evil-collection.el b/evil-collection.el
index d9a23be..d02e9a5 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -67,23 +67,6 @@ See https://github.com/emacs-evil/evil-collection/issues/60 for more details."))
 See https://github.com/emacs-evil/evil-collection/issues/60 for more details.")
   (require 'evil-integration))
 
-;; Compatibility
-
-(eval-and-compile
-  (with-no-warnings
-    (if (version< emacs-version "26")
-        (progn
-          (defalias 'evil-collection-if-let* #'if-let)
-          (defalias 'evil-collection-when-let* #'when-let)
-          (function-put #'evil-collection-if-let* 'lisp-indent-function 2)
-          (function-put #'evil-collection-when-let* 'lisp-indent-function 1))
-      (defalias 'evil-collection-if-let* #'if-let*)
-      (defalias 'evil-collection-when-let* #'when-let*))))
-
-;; Compatibility
-
-(declare-function org-table-align "org-table.el" nil)
-
 (defgroup evil-collection nil
   "A set of keybindings for Evil mode"
   :group 'evil)
diff --git a/modes/evil-mc/evil-collection-evil-mc.el b/modes/evil-mc/evil-collection-evil-mc.el
index 4f095ae..ef84782 100644
--- a/modes/evil-mc/evil-collection-evil-mc.el
+++ b/modes/evil-mc/evil-collection-evil-mc.el
@@ -36,8 +36,7 @@
 
 (defun evil-collection-evil-mc-clear-keymap (&rest _args)
   "Brute force remove `evil-mc-key-map' from `evil-mode-map-alist'."
-  (evil-collection-when-let*
-      ((evil-mc-map (assq 'evil-mc-mode evil-mode-map-alist)))
+  (when-let ((evil-mc-map (assq 'evil-mc-mode evil-mode-map-alist)))
     (setq evil-mode-map-alist
           (delq evil-mc-map evil-mode-map-alist))))