Remove DHCP Client Identifier hack, this can, and should, be done in policy.