diff --git a/.gitignore b/.gitignore
index c09a28e..770d239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /.cask
 /.hive-maint
 /custom.el
+/elpa
 /var
diff --git a/.gitmodules b/.gitmodules
index 42fb0f5..cb550b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -24,9 +24,6 @@
 [submodule "epkg"]
 	path = lib/epkg
 	url = git@github.com:emacscollective/epkg.git
-[submodule "finalize"]
-	path = lib/finalize
-	url = git@github.com:skeeto/elisp-finalize.git
 [submodule "git-modes"]
 	path = lib/git-modes
 	url = git@github.com:magit/git-modes.git
diff --git a/Makefile b/Makefile
index be44cf3..1cc4e36 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,20 @@
 
 EMACS ?= emacs
 
-.PHONY: all help build build-init quick bootstrap
+.PHONY: all help build build-init quick bootstrap clean
 .FORCE:
 
 all: build
 
+SILENCIO  = --load subr-x
+SILENCIO += --eval "(put 'if-let 'byte-obsolete-info nil)"
+SILENCIO += --eval "(put 'when-let 'byte-obsolete-info nil)"
+SILENCIO += --eval "(fset 'original-message (symbol-function 'message))"
+SILENCIO += --eval "(fset 'message\
+(lambda (format &rest args)\
+  (unless (equal format \"pcase-memoize: equal first branch, yet different\")\
+    (apply 'original-message format args))))"
+
 help:
 	$(info )
 	$(info make [all|build]    = rebuild all drones and init files)
@@ -17,11 +26,12 @@ help:
 	$(info make lib/DRONE      = rebuild DRONE)
 	$(info make build-init     = rebuild init files)
 	$(info make bootstrap      = bootstrap collective or new drones)
+	$(info make clean          = remove all *.elc and *-autoloads.el)
 	@printf "\n"
 
 build:
 	@rm -f init.elc
-	@$(EMACS) -Q --batch -L lib/borg --load borg \
+	@$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \
 	--funcall borg-initialize \
 	--funcall borg-batch-rebuild 2>&1
 
@@ -33,12 +43,12 @@ build-init:
 
 quick:
 	@rm -f init.elc
-	@$(EMACS) -Q --batch -L lib/borg --load borg \
+	@$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \
 	--funcall borg-initialize \
 	--eval  '(borg-batch-rebuild t)' 2>&1
 
 lib/%: .FORCE
-	@$(EMACS) -Q --batch -L lib/borg --load borg \
+	@$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \
 	--funcall borg-initialize \
 	--eval  '(borg-build "$(@F)")' 2>&1
 
@@ -49,3 +59,8 @@ bootstrap:
 	@bin/borg-bootstrap
 	@printf "\n=== Running 'make build' ===\n\n"
 	@make build
+
+clean:
+	@find lib -name '*-autoloads.el' -exec rm '{}' ';'
+	@find lib -name '*.elc' -exec rm '{}' ';'
+	@rm -f init.elc
diff --git a/init.el b/init.el
index c3053ce..edf7ee9 100644
--- a/init.el
+++ b/init.el
@@ -10,6 +10,7 @@
   (setq user-emacs-directory (file-name-directory user-init-file))
   (message "Loading %s..." user-init-file)
   (setq package-enable-at-startup nil)
+  ;; (package-initialize)
   (setq inhibit-startup-buffer-menu t)
   (setq inhibit-startup-screen t)
   (setq inhibit-startup-echo-area-message "locutus")
@@ -29,6 +30,11 @@
   (require  'use-package)
   (setq use-package-verbose t))
 
+(use-package subr-x
+  :config
+  (put 'if-let   'byte-obsolete-info nil)
+  (put 'when-let 'byte-obsolete-info nil))
+
 (use-package auto-compile
   :demand t
   :config
diff --git a/lib/auto-compile b/lib/auto-compile
index a31819a..694b92e 160000
--- a/lib/auto-compile
+++ b/lib/auto-compile
@@ -1 +1 @@
-Subproject commit a31819a1b75a2320edb0f7f25d6c6faf528bf41a
+Subproject commit 694b92ea58feb30a0104ccf2424fd921235ba517
diff --git a/lib/borg b/lib/borg
index ba62a78..4b908fd 160000
--- a/lib/borg
+++ b/lib/borg
@@ -1 +1 @@
-Subproject commit ba62a78d2b3f9f96306c5aa07492106073201936
+Subproject commit 4b908fd5b43dd9e48b3580b87cc77c4b65939f08
diff --git a/lib/closql b/lib/closql
index 49862bf..01cb892 160000
--- a/lib/closql
+++ b/lib/closql
@@ -1 +1 @@
-Subproject commit 49862bfdd1540d443d278fadef16a83388b360cb
+Subproject commit 01cb892f6a457fbff857d924cebfdc77f69bd45d
diff --git a/lib/emacsql b/lib/emacsql
index e3bc9b1..616dde3 160000
--- a/lib/emacsql
+++ b/lib/emacsql
@@ -1 +1 @@
-Subproject commit e3bc9b105f6f2de514dd689c8fa8f74f1d610a04
+Subproject commit 616dde37524f47246bbb161f20d3f5f090f10fbf
diff --git a/lib/epkg b/lib/epkg
index 6114b78..71ce3ff 160000
--- a/lib/epkg
+++ b/lib/epkg
@@ -1 +1 @@
-Subproject commit 6114b78b84cd8a96a117b7652d1e5138eee4b896
+Subproject commit 71ce3ffd41bdc90c649a044ddbee0b32b329c612
diff --git a/lib/finalize b/lib/finalize
deleted file mode 160000
index 0496a7b..0000000
--- a/lib/finalize
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0496a7b8f2f8b197010d8602b5fc529f5104704a
diff --git a/lib/magit b/lib/magit
index aa0f186..0ee62ee 160000
--- a/lib/magit
+++ b/lib/magit
@@ -1 +1 @@
-Subproject commit aa0f186467711534ec538e5bf9ea5fdbad0cfc1f
+Subproject commit 0ee62ee80eca660a5d05dab34bcf4b80a3ee749d
diff --git a/lib/magit-popup b/lib/magit-popup
index 70e3cdd..3f23e81 160000
--- a/lib/magit-popup
+++ b/lib/magit-popup
@@ -1 +1 @@
-Subproject commit 70e3cdd6140ebdf477f86b88ac2bd1a8de115e88
+Subproject commit 3f23e81eb0267d6578d8f1733c5e42699b0229a1
diff --git a/lib/use-package b/lib/use-package
index 98f9e12..865e931 160000
--- a/lib/use-package
+++ b/lib/use-package
@@ -1 +1 @@
-Subproject commit 98f9e120aaac902f611807002ed58215b2620bfd
+Subproject commit 865e931889f33495f3ce1b9e14b5b3e959887424
diff --git a/lib/with-editor b/lib/with-editor
index ee39f23..05338d8 160000
--- a/lib/with-editor
+++ b/lib/with-editor
@@ -1 +1 @@
-Subproject commit ee39f232f2daf997498a4030d104c35ae397f457
+Subproject commit 05338d893f3879391d7283324364b472e3f4f4d1