diff --git a/gradle.properties b/gradle.properties
index b5b4da66459..e8530c3f16c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,8 +15,6 @@ opencms_configuration=
 additional_repositories=
 system_runtimeinfo=org.opencms.db.CmsDbContextFactory
 updater_excluded_modules=\
-org.opencms.workplace.galleries,\
-org.opencms.workplace.categories,\
 org.opencms.apollo.template.basics,\
 org.opencms.apollo.template.democontents,\
 org.opencms.apollo.template.extensions,\
diff --git a/modules/all-modules.properties b/modules/all-modules.properties
index bd115834878..d1fc7ff1bda 100755
--- a/modules/all-modules.properties
+++ b/modules/all-modules.properties
@@ -15,9 +15,7 @@ org.opencms.locale.ja,\
 org.opencms.locale.ru,\
 org.opencms.workplace,\
 org.opencms.workplace.administration,\
-org.opencms.workplace.categories,\
 org.opencms.workplace.explorer,\
-org.opencms.workplace.galleries,\
 org.opencms.workplace.handler,\
 org.opencms.workplace.spellcheck,\
 org.opencms.workplace.tools.accounts,\
diff --git a/modules/org.opencms.workplace.categories/resources/manifest.xml b/modules/org.opencms.workplace.categories/resources/manifest.xml
deleted file mode 100644
index 215a3a11219..00000000000
--- a/modules/org.opencms.workplace.categories/resources/manifest.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<export>
-	<info>
-		<creator>Admin</creator>
-		<opencms_version>10.0.0</opencms_version>
-		<createdate>Mon, 25 Jun 2007 14:16:18 GMT</createdate>
-		<infoproject>Offline</infoproject>
-		<export_version>7</export_version>
-	</info>
-	<module>
-		<name>org.opencms.workplace.categories</name>
-		<nicename><![CDATA[OpenCms Workplace categories]]></nicename>
-		<group>OpenCms Workplace</group>
-		<class/>
-		<description><![CDATA[<p>This module contains the OpenCms Workplace category folders.</p>
-<p>It includes the system wide category folders.</p>
-<p><i>&copy; 2016 by Alkacon Software GmbH (http://www.alkacon.com).</i></p>]]></description>
-		<version>10.0.0</version>
-		<authorname><![CDATA[Alkacon Software GmbH]]></authorname>
-		<authoremail><![CDATA[info@alkacon.com]]></authoremail>
-		<datecreated/>
-		<userinstalled/>
-		<dateinstalled/>
-		<dependencies/>
-		<exportpoints/>
-		<resources/>
-		<parameters/>
-	</module>
-	<files>
-		<file>
-			<destination>system</destination>
-			<type>folder</type>
-			<uuidstructure>0a0c1bea-2325-11dc-8245-53aeb3024788</uuidstructure>
-			<datelastmodified>Mon, 27 Mar 2006 12:00:00 GMT</datelastmodified>
-			<userlastmodified>Admin</userlastmodified>
-			<datecreated>Mon, 25 Jun 2007 14:04:50 GMT</datecreated>
-			<usercreated>Admin</usercreated>
-			<flags>0</flags>
-			<properties/>
-			<relations/>
-			<accesscontrol/>
-		</file>
-		<file>
-			<destination>system/categories</destination>
-			<type>folder</type>
-			<uuidstructure>41563817-12a7-11dc-a287-2b20cd96941e</uuidstructure>
-			<datelastmodified>Mon, 04 Jun 2007 14:24:07 GMT</datelastmodified>
-			<userlastmodified>Admin</userlastmodified>
-			<datecreated>Mon, 04 Jun 2007 14:24:07 GMT</datecreated>
-			<usercreated>Admin</usercreated>
-			<flags>0</flags>
-			<properties/>
-			<relations/>
-			<accesscontrol/>
-		</file>
-	</files>
-</export>
diff --git a/modules/org.opencms.workplace.galleries/resources/manifest.xml b/modules/org.opencms.workplace.galleries/resources/manifest.xml
deleted file mode 100644
index 69eff3c888f..00000000000
--- a/modules/org.opencms.workplace.galleries/resources/manifest.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<export>
-	<info>
-		<creator>Admin</creator>
-		<opencms_version>10.0.0</opencms_version>
-		<createdate>Mon, 25 Jun 2007 14:16:18 GMT</createdate>
-		<infoproject>Offline</infoproject>
-		<export_version>7</export_version>
-	</info>
-	<module>
-		<name>org.opencms.workplace.galleries</name>
-		<nicename><![CDATA[OpenCms Workplace galleries]]></nicename>
-		<group>OpenCms Workplace</group>
-		<class/>
-		<description><![CDATA[<p>This module contains the OpenCms Workplace gallery folders.</p>
-<p>It includes the system wide gallery folders.</p>
-<p><i>&copy; 2016 by Alkacon Software GmbH (http://www.alkacon.com).</i></p>]]></description>
-		<version>10.0.0</version>
-		<authorname><![CDATA[Alkacon Software GmbH]]></authorname>
-		<authoremail><![CDATA[info@alkacon.com]]></authoremail>
-		<datecreated/>
-		<userinstalled/>
-		<dateinstalled/>
-		<dependencies/>
-		<exportpoints/>
-		<resources/>
-		<parameters/>
-	</module>
-	<files>
-		<file>
-			<destination>system</destination>
-			<type>folder</type>
-			<uuidstructure>0a0c1bea-2325-11dc-8245-53aeb3024788</uuidstructure>
-			<datelastmodified>Mon, 27 Mar 2006 12:00:00 GMT</datelastmodified>
-			<userlastmodified>Admin</userlastmodified>
-			<datecreated>Mon, 25 Jun 2007 14:04:50 GMT</datecreated>
-			<usercreated>Admin</usercreated>
-			<flags>0</flags>
-			<properties/>
-			<relations/>
-			<accesscontrol/>
-		</file>
-		<file>
-			<destination>system/galleries</destination>
-			<type>folder</type>
-			<uuidstructure>8202a46a-11b7-11db-91cd-fdbae480bac9</uuidstructure>
-			<datelastmodified>Mon, 27 Mar 2006 12:00:00 GMT</datelastmodified>
-			<userlastmodified>Admin</userlastmodified>
-			<datecreated>Mon, 27 Jun 2005 08:00:00 GMT</datecreated>
-			<usercreated>Admin</usercreated>
-			<flags>0</flags>
-			<properties/>
-			<relations/>
-			<accesscontrol/>
-		</file>
-		<file>
-			<destination>system/galleries/download</destination>
-			<type>folder</type>
-			<uuidstructure>8289d3f6-366c-11db-ab2a-8b2c5a4caf8d</uuidstructure>
-			<datelastmodified>Mon, 27 Mar 2006 12:00:00 GMT</datelastmodified>
-			<userlastmodified>Admin</userlastmodified>
-			<datecreated>Mon, 27 Jun 2005 08:00:00 GMT</datecreated>
-			<usercreated>Admin</usercreated>
-			<flags>0</flags>
-			<properties>
-				<property>
-					<name>exportname</name>
-					<value><![CDATA[/download/]]></value>
-				</property>
-			</properties>
-			<relations/>
-			<accesscontrol/>
-		</file>
-		<file>
-			<destination>system/galleries/externallinks</destination>
-			<type>folder</type>
-			<uuidstructure>829c2379-366c-11db-ab2a-8b2c5a4caf8d</uuidstructure>
-			<datelastmodified>Mon, 27 Mar 2006 12:00:00 GMT</datelastmodified>
-			<userlastmodified>Admin</userlastmodified>
-			<datecreated>Mon, 27 Jun 2005 08:00:00 GMT</datecreated>
-			<usercreated>Admin</usercreated>
-			<flags>0</flags>
-			<properties>
-				<property>
-					<name>export</name>
-					<value><![CDATA[false]]></value>
-				</property>
-			</properties>
-			<relations/>
-			<accesscontrol/>
-		</file>
-		<file>
-			<destination>system/galleries/htmlgalleries</destination>
-			<type>folder</type>
-			<uuidstructure>82a0b75c-366c-11db-ab2a-8b2c5a4caf8d</uuidstructure>
-			<datelastmodified>Mon, 27 Mar 2006 12:00:00 GMT</datelastmodified>
-			<userlastmodified>Admin</userlastmodified>
-			<datecreated>Mon, 27 Jun 2005 08:00:00 GMT</datecreated>
-			<usercreated>Admin</usercreated>
-			<flags>0</flags>
-			<properties>
-				<property>
-					<name>export</name>
-					<value><![CDATA[false]]></value>
-				</property>
-			</properties>
-			<relations/>
-			<accesscontrol/>
-		</file>
-		<file>
-			<destination>system/galleries/pics</destination>
-			<type>folder</type>
-			<uuidstructure>8221c535-11b7-11db-91cd-fdbae480bac9</uuidstructure>
-			<datelastmodified>Mon, 27 Mar 2006 12:00:00 GMT</datelastmodified>
-			<userlastmodified>Admin</userlastmodified>
-			<datecreated>Mon, 27 Jun 2005 08:00:00 GMT</datecreated>
-			<usercreated>Admin</usercreated>
-			<flags>0</flags>
-			<properties>
-				<property>
-					<name>exportname</name>
-					<value><![CDATA[/pics/]]></value>
-				</property>
-			</properties>
-			<relations/>
-			<accesscontrol/>
-		</file>
-	</files>
-</export>