diff --git a/.mrconfig b/.mrconfig
index bd6bb8e..cd2ef7f 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -1,99 +1,96 @@
 # keep the list sorted alphabetically by local repo name
 
 [snippets]
 checkout = git clone 'https://forge.softwareheritage.org/source/snippets.git' 'snippets'
 
 [swh-archiver]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-archiver.git' 'swh-archiver'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-core]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-core.git' 'swh-core'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-deposit]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-deposit.git' 'swh-deposit'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-docs]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-docs.git' 'swh-docs'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-indexer]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-indexer.git' 'swh-indexer'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-journal]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-journal.git' 'swh-journal'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-lister]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-lister.git' 'swh-lister'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-loader-core]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-loader-core.git' 'swh-loader-core'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-loader-debian]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-loader-debian.git' 'swh-loader-debian'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-loader-dir]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-loader-dir.git' 'swh-loader-dir'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-loader-git]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-loader-git.git' 'swh-loader-git'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-loader-mercurial]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-loader-mercurial.git' 'swh-loader-mercurial'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-loader-pypi]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-loader-pypi.git' 'swh-loader-pypi'
 fixup = ../bin/git-add-pre-commit-hook .
 
 [swh-loader-svn]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-loader-svn.git' 'swh-loader-svn'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-loader-tar]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-loader-tar.git' 'swh-loader-tar'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-mirror-forge]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-mirror-forge.git' 'swh-mirror-forge'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-model]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-model.git' 'swh-model'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-objstorage]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-objstorage.git' 'swh-objstorage'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-py-template]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-py-template.git' 'swh-py-template'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-scheduler]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-scheduler.git' 'swh-scheduler'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-storage]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-storage.git' 'swh-storage'
 fixups = ../bin/git-add-pre-commit-hook .
 
-[swh-storage-testdata]
-checkout = git clone 'https://forge.softwareheritage.org/source/swh-storage-testdata.git' 'swh-storage-testdata'
-
 [swh-vault]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-vault.git' 'swh-vault'
 fixups = ../bin/git-add-pre-commit-hook .
 
 [swh-web]
 checkout = git clone 'https://forge.softwareheritage.org/source/swh-web.git' 'swh-web'
 fixups = ../bin/git-add-pre-commit-hook .
diff --git a/Makefile b/Makefile
index a9c75ea..7fd3745 100644
--- a/Makefile
+++ b/Makefile
@@ -1,49 +1,41 @@
 PYMODULES := $(shell bin/ls-py-modules)
 DB_MODULES = swh-storage swh-archiver swh-scheduler swh-indexer swh-scheduler/sql/updater
 DOC_MODULE = swh-docs
 
 all:
 
 # TODO this is too close to "docs" below, but is meant to go away anyhow, when
 # the dependency graph stuff will migrate to the swh-docs/ module
 .PHONY: doc
 doc:
 	make -C doc/
 
 check: $(patsubst %,check/%,$(PYMODULES))
 distclean: $(patsubst %,distclean/%,$(PYMODULES))
 test: $(patsubst %,test/%,$(PYMODULES))
 
 docs: $(patsubst %,docs/%,$(filter-out $(DOC_MODULE),$(PYMODULES)))
 docs-apidoc: $(patsubst %,docs-apidoc/%,$(filter-out $(DOC_MODULE),$(PYMODULES)))
 docs-clean: $(patsubst %,docs-clean/%,$(filter-out $(DOC_MODULE),$(PYMODULES)))
 
 check/%:
 	make -C $* check
 distclean/%:
 	make -C $* distclean
 test/%:
 	make -C $* test
 
 docs/%:
 	make -C $*/docs
 docs-apidoc/%:
 	make -C $*/docs apidoc
 docs-clean/%:
 	make -C $*/docs clean
 
-.PHONY: rebuild-testdata rebuild-storage-testdata
-rebuild-testdata: rebuild-storage-testdata
-rebuild-storage-testdata:
-	for dbmodule in $(DB_MODULES); do \
-		make -C $$dbmodule/sql/ distclean filldb; \
-	done
-	make -C swh-storage-testdata distclean dumpdb
-
+.PHONY: update clean
 update:
-	make -C swh-storage-testdata distclean
 	git pull
 	mr up
 
 clean:
 	make -C doc/ clean