diff --git a/neutron/db/ipam_pluggable_backend.py b/neutron/db/ipam_pluggable_backend.py
index 192553bd6f0..dc2c7050071 100644
--- a/neutron/db/ipam_pluggable_backend.py
+++ b/neutron/db/ipam_pluggable_backend.py
@@ -450,11 +450,6 @@ class IpamPluggableBackend(ipam_backend_mixin.IpamBackendMixin):
 
     def add_auto_addrs_on_network_ports(self, context, subnet, ipam_subnet):
         """For an auto-address subnet, add addrs for ports on the net."""
-        # TODO(kevinbenton): remove after bug/1666493 is resolved
-        if subnet['id'] != ipam_subnet.subnet_manager.neutron_id:
-            raise RuntimeError(
-                "Subnet manager doesn't match subnet. %s != %s"
-                % (subnet['id'], ipam_subnet.subnet_manager.neutron_id))
         # TODO(ataraday): switched for writer when flush_on_subtransaction
         # will be available for neutron
         with context.session.begin(subtransactions=True):
@@ -473,10 +468,6 @@ class IpamPluggableBackend(ipam_backend_mixin.IpamBackendMixin):
                       'eui64_address': True,
                       'mac': port['mac_address']}
                 ip_request = factory.get_request(context, port, ip)
-                # TODO(kevinbenton): remove after bug/1666493 is resolved
-                LOG.debug("Requesting with IP request: %s port: %s ip: %s "
-                          "for subnet %s and ipam_subnet %s", ip_request,
-                          port, ip, subnet, ipam_subnet)
                 try:
                     ip_address = ipam_subnet.allocate(ip_request)
                     allocated = port_obj.IPAllocation(
diff --git a/neutron/tests/unit/db/test_ipam_pluggable_backend.py b/neutron/tests/unit/db/test_ipam_pluggable_backend.py
index 2a44f03be73..0958964df51 100644
--- a/neutron/tests/unit/db/test_ipam_pluggable_backend.py
+++ b/neutron/tests/unit/db/test_ipam_pluggable_backend.py
@@ -377,9 +377,6 @@ class TestDbBasePluginIpam(test_db_base.NeutronDbPluginV2TestCase):
     @mock.patch('neutron.ipam.driver.Pool')
     def test_create_ipv6_pd_subnet_over_ipam(self, pool_mock):
         mocks = self._prepare_mocks_with_pool_mock(pool_mock)
-        # TODO(kevinbenton): remove after bug/1666493 is resolved
-        sub = pool_mock.get_instance.return_value.get_subnet.return_value
-        sub.subnet_manager.neutron_id = mock.ANY
         cfg.CONF.set_override('ipv6_pd_enabled', True)
         cidr = n_const.PROVISIONAL_IPV6_PD_PREFIX
         allocation_pools = [netaddr.IPRange('::2', '::ffff:ffff:ffff:ffff')]