diff --git a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st
index 7a0a647..5a3d4cf 100644
--- a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st
+++ b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st
@@ -92,13 +92,4 @@ BaselineOfMiniDocs >> xmlParserHTML: spec [
 			repository: 'github://pharo-contributions/XML-XMLParserHTML/src';
 			loads: #('ALL')];
 		import: 'XMLParserHTML'
-	"Metacello new
-		baseline: 'XMLParserHTML';
-		repository: 'github://pharo-contributions/XML-XMLParserHTML/src';
-		onConflict: [ :ex | ex useLoaded ];
-    	onUpgrade: [ :ex | ex useLoaded ];
-    	onDowngrade: [ :ex | ex useLoaded ];
-    	onWarningLog;
-		load.
-	spec baseline: 'XMLParserHTML' with: [spec repository: 'github://pharo-contributions/XML-XMLParserHTML/src']"
 ]
diff --git a/src/MiniDocs/MiniDocsServer.class.st b/src/MiniDocs/MiniDocsServer.class.st
index 975e2cf..2869eea 100644
--- a/src/MiniDocs/MiniDocsServer.class.st
+++ b/src/MiniDocs/MiniDocsServer.class.st
@@ -39,7 +39,7 @@ MiniDocsServer class >> restart [
 
 { #category : #accessing }
 MiniDocsServer class >> singleton [
-	^ singleton
+	^ singleton ifNil: [ singleton := MiniDocsServer teapot ]
 ]
 
 { #category : #accessing }