diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7023e03..fc97c69 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -62,8 +62,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Vitrage Specs'
-copyright = u'%s, OpenStack Vitrage Team' % datetime.date.today().year
+project = 'Vitrage Specs'
+copyright = '%s, OpenStack Vitrage Team' % datetime.date.today().year
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -192,8 +192,8 @@ latex_elements = {
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
-    ('index', 'Vitrage-specs.tex', u'Vitrage Specs',
-     u'OpenStack Vitrage Team', 'manual'),
+    ('index', 'Vitrage-specs.tex', 'Vitrage Specs',
+     'OpenStack Vitrage Team', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -222,8 +222,8 @@ latex_documents = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'Vitrage-specs', u'Vitrage Design Specs',
-     u'OpenStack Vitrage Team', 'vitrage-specs', 'Design specifications for the Vitrage project.',
+    ('index', 'Vitrage-specs', 'Vitrage Design Specs',
+     'OpenStack Vitrage Team', 'vitrage-specs', 'Design specifications for the Vitrage project.',
      'Miscellaneous'),
 ]
 
@@ -240,10 +240,10 @@ texinfo_documents = [
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = u'Vitrage Specs'
-epub_author = u'OpenStack Vitrage Team'
-epub_publisher = u'OpenStack Vitrage Team'
-epub_copyright = u'2014, OpenStack Vitrage Team'
+epub_title = 'Vitrage Specs'
+epub_author = 'OpenStack Vitrage Team'
+epub_publisher = 'OpenStack Vitrage Team'
+epub_copyright = '2014, OpenStack Vitrage Team'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
diff --git a/specs/mitaka/aodh-notifier.rst b/specs/mitaka/aodh-notifier.rst
index 3a7b577..22e595d 100644
--- a/specs/mitaka/aodh-notifier.rst
+++ b/specs/mitaka/aodh-notifier.rst
@@ -72,8 +72,8 @@ Vitrage deduced alarms will look like this:
 +---------------------------+---------------------------------------------------------+
 | project_id                | 5542b27142154f30b32dea6238aa81aa                        |
 +---------------------------+---------------------------------------------------------+
-| query                     | [{u'field': u'resource_id', u'type': u'', u'value':     |
-|                           | u'b0bf3635-d9e8-4624-9793-7aac82948c0a', u'op': u'eq'}] |
+| query                     | [{field': 'resource_id', 'type': '', 'value':           |
+|                           | 'b0bf3635-d9e8-4624-9793-7aac82948c0a', 'op': 'eq'}]    |
 +---------------------------+---------------------------------------------------------+
 | repeat_actions            | False                                                   |
 +---------------------------+---------------------------------------------------------+