diff --git a/.mailmap b/.mailmap
index 21bdaaa3a501..4fad253df803 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,6 +43,7 @@
 <nirmal.ranganathan@rackspace.com> <nirmal.ranganathan@rackspace.coom>
 <paul@openstack.org> <paul.voccio@rackspace.com>
 <paul@openstack.org> <pvoccio@castor.local>
+<paul@openstack.org> <paul@substation9.com>
 <rconradharris@gmail.com> <rick.harris@rackspace.com>
 <rlane@wikimedia.org> <laner@controller>
 <sandy.walsh@rackspace.com> <sandy@sandywalsh.com>
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index d6d2ef52d4cb..23a499e5c9df 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -319,8 +319,6 @@ class VMHelper(HelperBase):
     def create_snapshot(cls, session, instance_id, vm_ref, label):
         """Creates Snapshot (Template) VM, Snapshot VBD, Snapshot VDI,
         Snapshot VHD"""
-        #TODO(sirp): Add quiesce and VSS locking support when Windows support
-        # is added
         LOG.debug(_("Snapshotting VM %(vm_ref)s with label '%(label)s'...")
                 % locals())