diff --git a/Makefile b/Makefile
index 3e36fc88e..36e1da9b6 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@ ALL_BUT_GZ=$(subst $(wildcard *.tar.gz),,$(wildcard *))
 DATADIR=/usr/share/plinth
 PYDIR=$(DATADIR)/python/plinth
 
-## Catch-all tagets
-default: config dirs template css docs dbs
+## Catch-all targets
+default: config dirs template css docs
 all: default
 
 predepend:
@@ -34,7 +34,7 @@ install: default apache-install freedombox-setup-install
 	cp share/init.d/plinth $(DESTDIR)/etc/init.d
 	install plinth $(DESTDIR)/usr/bin/
 	mkdir -p $(DESTDIR)/var/lib/plinth/cherrypy_sessions $(DESTDIR)/var/log/plinth $(DESTDIR)/var/run
-	cp -r data/* $(DESTDIR)/var/lib/plinth
+	mkdir -p $(DESTDIR)/var/lib/plinth/data
 	rm -f $(DESTDIR)/var/lib/plinth/users/sqlite3.distrib
 
 freedombox-setup-install:
@@ -47,11 +47,6 @@ uninstall:
 	rm -f $(DESTDIR)/usr/bin/plinth $(DESTDIR)/etc/init.d/plinth \
 		$(DESTDIR)/usr/share/man/man1/plinth.1.gz $(DESTDIR)/var/run/plinth.pid
 
-dbs: data/users.sqlite3
-
-data/users.sqlite3: data/users.sqlite3.distrib
-	cp data/users.sqlite3.distrib data/users.sqlite3
-
 dirs:
 	@mkdir -p data/cherrypy_sessions
 
diff --git a/data/users.sqlite3.distrib b/data/users.sqlite3.distrib
deleted file mode 100644
index 2d805a153..000000000
Binary files a/data/users.sqlite3.distrib and /dev/null differ
diff --git a/data/users/admin b/data/users/admin
deleted file mode 100644
index acda278c8..000000000
--- a/data/users/admin
+++ /dev/null
@@ -1 +0,0 @@
-{"username": "admin", "name": "Admin", "expert": "on", "groups": ["expert"], "passphrase": "5ebe2294ecd0e0f08eab7690d2a6ee69", "password": "", "email": "root@localhost"}
\ No newline at end of file