diff --git a/container b/container
index 5dab9a619..2829b819d 100755
--- a/container
+++ b/container
@@ -47,16 +47,15 @@ Shared folder: Using systemd-nspawn, the project directory is mounted as
 /freedombox inside the container. The project directory is determined as
 directory in which this script resides. The project folder from the container
 point of view will be read-only. Container should be able to write various
-files such as build files, FreedomBox sqlite3 database and session files into
-the /freedombox folder. To enable writing, an additional read-write folder is
-overlayed onto /freedombox folder in the container. This directory can't be
-created under the project folder and is created instead in
-$XDG_DATA_HOME/freedombox-container/overlay/$DISTRIBUTION. If XDG_DATA_HOME is
-not set, it is assumed to be $HOME/.local/shared/. Whenever data is written
-into /freedombox directory inside the container, this directory on the host
-receives the changes. See documentation for Overlay filesystem for further
-details. When container is destroyed, this overlay folder is destroyed to
-ensure clean state after bringing up the container again.
+files such as build files into the /freedombox folder. To enable writing, an
+additional read-write folder is overlayed onto /freedombox folder in the
+container. This directory can't be created under the project folder and is
+created instead in $XDG_DATA_HOME/freedombox-container/overlay/$DISTRIBUTION.
+If XDG_DATA_HOME is not set, it is assumed to be $HOME/.local/shared/. Whenever
+data is written into /freedombox directory inside the container, this directory
+on the host receives the changes. See documentation for Overlay filesystem for
+further details. When container is destroyed, this overlay folder is destroyed
+to ensure clean state after bringing up the container again.
 
 Users: PrivateUsers configuration flag for systemd-nspawn is currently off.
 This means that each user's UID on the host is also the same UID in the
@@ -138,9 +137,6 @@ KEY_SERVER = 'keys.gnupg.net'
 PROVISION_SCRIPT = '''
 set -x
 
-# Remove FreedomBox database lingering in source directory to start fresh
-sudo rm -f /freedombox/data/var/lib/plinth/plinth.sqlite3
-
 cd /freedombox/
 
 sudo apt-get update
diff --git a/plinth/develop.config b/plinth/develop.config
index 05157b757..e2a61f89a 100644
--- a/plinth/develop.config
+++ b/plinth/develop.config
@@ -1,8 +1,5 @@
 [Path]
 file_root = %(parent_parent_dir)s
 config_dir = %(file_root)s/data/etc/plinth
-data_dir = %(file_root)s/data/var/lib/plinth
 actions_dir = %(file_root)s/actions
 doc_dir = %(file_root)s/doc
-custom_static_dir = %(file_root)s/data/var/www/plinth/custom/static
-store_file = %(data_dir)s/plinth.sqlite3