diff --git a/jenkins-package-dependencies.cfg b/jenkins-package-dependencies.cfg
index bb5e77fe04..d14a26cf3d 100644
--- a/jenkins-package-dependencies.cfg
+++ b/jenkins-package-dependencies.cfg
@@ -82,12 +82,12 @@ mode = 755
 [jenkins-package-dependencies-cmf]
 <= package-dependencies-generic
 output = ${buildout:bin-directory}/jenkins-package-dependencies-cmf
-distributions = CMFCore CMFDefault CMFDiffTool CMFDynamicViewFTI CMFEditions CMFFormController CMFPlacefulWorkflow CMFQuickInstallerTool CMFUid
+distributions = CMFCore CMFDiffTool CMFDynamicViewFTI CMFEditions CMFFormController CMFPlacefulWorkflow CMFQuickInstallerTool CMFUid
 
 [jenkins-package-dependencies-cmf-imports]
 <= package-dependencies-generic-imports
 output = ${buildout:bin-directory}/jenkins-package-dependencies-cmf-imports
-distributions = Products.CMFCore Products.CMFDefault Products.CMFDiffTool Products.CMFDynamicViewFTI Products.CMFEditions Products.CMFFormController Products.CMFPlacefulWorkflow Products.CMFQuickInstallerTool Products.CMFUid
+distributions = Products.CMFCore Products.CMFDiffTool Products.CMFDynamicViewFTI Products.CMFEditions Products.CMFFormController Products.CMFPlacefulWorkflow Products.CMFQuickInstallerTool Products.CMFUid
 
 [jenkins-package-dependencies-pac]
 <= package-dependencies-generic
diff --git a/plips/plip-nocmfdefault.cfg b/plips/plip-nocmfdefault.cfg
deleted file mode 100644
index 934b4ca6d6..0000000000
--- a/plips/plip-nocmfdefault.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://github.com/plone/Products.CMFPlone/issues/388
-# CMFDefault removal. This does not need a PLIP.
-
-[buildout]
-extends = plipbase.cfg
-
-auto-checkout +=
-    Products.Archetypes
-    Products.CMFDynamicViewFTI
-    Products.PortalTransforms
-    plone.app.content
-    plone.app.testing
-
-[sources]
-#Products.CMFPlone             = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=tomgross-bodyfinder
-Products.CMFDynamicViewFTI     = git ${remotes:plone}/Products.CMFDynamicViewFTI.git pushurl=${remotes:plone_push}/Products.CMFDynamicViewFTI.git branch=master
-Products.PortalTransforms      = git ${remotes:plone}/Products.PortalTransforms.git pushurl=${remotes:plone_push}/Products.PortalTransforms.git branch=tomgross-nocmfdefault
-Products.Archetypes                 = git ${remotes:plone}/Products.Archetypes.git pushurl=${remotes:plone_push}/Products.Archetypes.git branch=tomgross-nocmfdefault
-plone.app.content                   = git ${remotes:plone}/plone.app.content.git pushurl=${remotes:plone_push}/plone.app.content.git branch=tomgross-nocmfdefault
-plone.app.testing              = git ${remotes:plone}/plone.app.testing.git pushurl=${remotes:plone_push}/plone.app.testing.git branch=tomgross-nocmfdefault
diff --git a/tests.cfg b/tests.cfg
index 015b6d4e7f..dcab9958e6 100644
--- a/tests.cfg
+++ b/tests.cfg
@@ -7,7 +7,6 @@ test-eggs =
     Products.ATContentTypes [test]
     Products.Archetypes [test]
     Products.CMFCore
-    Products.CMFDefault
     Products.CMFDiffTool
     Products.CMFDynamicViewFTI
     Products.CMFEditions
@@ -234,7 +233,6 @@ AT_plone_app_testing =
     Products.contentmigration
     Products.CMFDynamicViewFTI
 CMF =
-    Products.CMFDefault
     Products.CMFUid
     Products.GenericSetup
     Products.PluggableAuthService
diff --git a/versions.cfg b/versions.cfg
index 81ab5e3457..c11cb30017 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -89,7 +89,6 @@ Plone                                 = 5.0b2
 Products.ATContentTypes               = 2.2.5
 Products.Archetypes                   = 1.10.7
 Products.CMFCore                      = 2.2.8
-Products.CMFDefault                   = 2.2.4
 Products.CMFDiffTool                  = 3.0.1
 Products.CMFDynamicViewFTI            = 4.1.2
 Products.CMFEditions                  = 2.2.13