diff --git a/alignak/borg.py b/alignak/borg.py
index 9f4ff031d..e07e6cd6f 100644
--- a/alignak/borg.py
+++ b/alignak/borg.py
@@ -51,7 +51,11 @@ class Borg(object):  # pylint: disable=R0903
     """Borg class define a simple __shared_state class attribute.
     __dict__ points to this value when calling __init__
 
-    TODO: Is this class really needed? Only subclassed by MacroSolver
+    This is used to make a Singleton-like pattern with a python object that inherits from the Borg.
+
+    The Singleton design pattern (DP) has a catchy name, but the wrong focus -- on identity
+    rather than on state. The Borg design pattern has all instances share state instead,
+    and Python makes it, literally, a snap.
     """
     __shared_state = {}
 
diff --git a/alignak/macroresolver.py b/alignak/macroresolver.py
index ffb817b8d..22754426a 100644
--- a/alignak/macroresolver.py
+++ b/alignak/macroresolver.py
@@ -59,7 +59,6 @@
 
 import re
 import time
-# import warnings
 
 from alignak.borg import Borg