diff --git a/lib/hawat/blueprints/dbstatus/__init__.py b/lib/hawat/blueprints/dbstatus/__init__.py
index e72dd35d05b3c62b796e80929cddcaa41c3956e5..4c43b2aee3495d86cba2ccd6ef264a8810fa9a8e 100644
--- a/lib/hawat/blueprints/dbstatus/__init__.py
+++ b/lib/hawat/blueprints/dbstatus/__init__.py
@@ -77,7 +77,6 @@ from mentat.datatype.sqldb import UserModel, GroupModel, FilterModel, SettingsRe
 
 import vial.menu
 import vial.acl
-import hawat.events
 from vial.app import VialBlueprint
 from vial.view import RenderableView, SimpleView
 from vial.view.mixin import HTMLMixin, AJAXMixin, SQLAlchemyMixin
diff --git a/lib/mentat/services/test_eventstorage.py b/lib/mentat/services/test_eventstorage.py
index b510a2044c44804100fd5d95c44f79412cda5aa1..60a9f728a3bfbe6484897dca9ddbf5b48b4b4639 100644
--- a/lib/mentat/services/test_eventstorage.py
+++ b/lib/mentat/services/test_eventstorage.py
@@ -277,7 +277,7 @@ class TestMentatStorage(unittest.TestCase):
 
         orig = json.dumps(idea_into, indent=4, sort_keys=True, default=idea_into.json_default)
         new  = json.dumps(idea_from, indent=4, sort_keys=True, default=idea_from.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         idea_from = storage.fetch_event(idea_into['ID'])
         self.assertTrue(idea_from)
@@ -292,7 +292,7 @@ class TestMentatStorage(unittest.TestCase):
 
         orig = json.dumps(idea_into, indent=4, sort_keys=True, default=idea_into.json_default)
         new  = json.dumps(idea_from, indent=4, sort_keys=True, default=idea_from.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         idea_from = storage.fetch_event(idea_into['ID'])
         self.assertTrue(idea_from)
@@ -840,7 +840,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -861,7 +861,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -882,7 +882,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -893,7 +893,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -904,7 +904,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -925,7 +925,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -936,7 +936,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -947,7 +947,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -967,7 +967,7 @@ class TestMentatStorage(unittest.TestCase):
             }
         )
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -978,7 +978,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -999,7 +999,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1020,7 +1020,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1031,7 +1031,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1052,7 +1052,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1073,7 +1073,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1094,7 +1094,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1115,7 +1115,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1136,7 +1136,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1157,7 +1157,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1178,7 +1178,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1199,7 +1199,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1220,7 +1220,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1241,7 +1241,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1262,7 +1262,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1283,7 +1283,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1304,7 +1304,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1325,7 +1325,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1346,7 +1346,7 @@ class TestMentatStorage(unittest.TestCase):
         )
         self.assertEqual(ideas_count, 1)
         new  = json.dumps(ideas_from, indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         # ---
 
@@ -1499,7 +1499,7 @@ class TestMentatStorage(unittest.TestCase):
         self.assertEqual(ideas_count, 1)
         orig = json.dumps(idea_into, indent=4, sort_keys=True, default=idea_into.json_default)
         new  = json.dumps(ideas_from[0], indent=4, sort_keys=True, default=idea_into.json_default)
-        self.assertEqual(orig, new, "\n".join([l for l in difflib.context_diff(orig.split("\n"), new.split("\n"))]))
+        self.assertEqual(orig, new, "\n".join(difflib.context_diff(orig.split("\n"), new.split("\n"))))
 
         self.assertEqual(
             storage.distinct_values('category'),