diff --git a/pom.xml b/pom.xml
index 70241b43..2a4c32a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,10 +132,13 @@
                                 <exclude>**/plantuml/bpm/**.*</exclude>
                                 <exclude>**/plantuml/dedication/**.*</exclude>
                                 <exclude>**/plantuml/directdot/**.*</exclude>
+                                <exclude>**/plantuml/eggs/**.*</exclude>
+                                <exclude>**/plantuml/math/**.*</exclude>
                                 <exclude>**/plantuml/mindmap/**.*</exclude>
                                 <exclude>**/plantuml/nwdiag/**.*</exclude>
                                 <exclude>**/plantuml/openiconic/**.*</exclude>
                                 <exclude>**/plantuml/salt/**.*</exclude>
+                                <exclude>**/plantuml/wbs/**.*</exclude>
                                 <exclude>**/plantuml/windowsdot/**.*</exclude>
                                 <exclude>sprites/archimate/**.*</exclude>
                                 <exclude>stdlib/**.*</exclude>
diff --git a/src/main/java/net/sourceforge/plantuml/PSystemBuilder.java b/src/main/java/net/sourceforge/plantuml/PSystemBuilder.java
index 0f6e2fde..686dc4b0 100644
--- a/src/main/java/net/sourceforge/plantuml/PSystemBuilder.java
+++ b/src/main/java/net/sourceforge/plantuml/PSystemBuilder.java
@@ -212,8 +212,8 @@ final public Diagram createPSystem(List<StringLocated> source, List<StringLocate
 	private static final List<PSystemFactory> factories = new ArrayList<>();
 
 	static {
-		factories.add(new PSystemWelcomeFactory());
-		factories.add(new PSystemColorsFactory());
+//		factories.add(new PSystemWelcomeFactory());
+//		factories.add(new PSystemColorsFactory());
 		factories.add(new SequenceDiagramFactory());
 		factories.add(new ClassDiagramFactory());
 		factories.add(new ActivityDiagramFactory());
@@ -243,7 +243,7 @@ final public Diagram createPSystem(List<StringLocated> source, List<StringLocate
 //		factories.add(new NwDiagramFactory(DiagramType.UML));
 //		factories.add(new NwDiagramFactory(DiagramType.NW));
 //		factories.add(new MindMapDiagramFactory());
-		factories.add(new WBSDiagramFactory());
+//		factories.add(new WBSDiagramFactory());
 
 		// ::uncomment when __CORE__
 		// factories.add(new PSystemSudokuFactory());
@@ -253,17 +253,17 @@ final public Diagram createPSystem(List<StringLocated> source, List<StringLocate
 		factories.add(new PSystemDefinitionFactory());
 //		factories.add(new ListSpriteDiagramFactory());
 //		factories.add(new StdlibDiagramFactory());
-		factories.add(new PSystemMathFactory(DiagramType.MATH));
-		factories.add(new PSystemLatexFactory(DiagramType.LATEX));
+//		factories.add(new PSystemMathFactory(DiagramType.MATH));
+//		factories.add(new PSystemLatexFactory(DiagramType.LATEX));
 //		factories.add(new PSystemCreoleFactory());
-		factories.add(new PSystemEggFactory());
-		factories.add(new PSystemAppleTwoFactory());
-		factories.add(new PSystemRIPFactory());
-		if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
-			factories.add(new PSystemPathFactory());
+//		factories.add(new PSystemEggFactory());
+//		factories.add(new PSystemAppleTwoFactory());
+//		factories.add(new PSystemRIPFactory());
+//		if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
+//			factories.add(new PSystemPathFactory());
 		factories.add(new PSystemOregonFactory());
 
-		factories.add(new PSystemCharlieFactory());
+//		factories.add(new PSystemCharlieFactory());
 
 		factories.add(new GanttDiagramFactory());
 		factories.add(new ChronologyDiagramFactory());