diff --git a/lib/App/Netdisco/Core/Discover.pm b/lib/App/Netdisco/Core/Discover.pm
index 3e9fe5fe..6f97f100 100644
--- a/lib/App/Netdisco/Core/Discover.pm
+++ b/lib/App/Netdisco/Core/Discover.pm
@@ -853,20 +853,6 @@ sub store_neighbors {
             $device->ip, $remote_ip, ($remote_type || ''), $port;
           push @to_discover, [$remote_ip, $remote_type];
 
-          # further device type discovery using MAC OUI
-          # only works once device is fully discovered (so we have a MAC addr)
-          my $neigh = get_device($remote_ip);
-          if (blessed $neigh and $neigh->in_storage and $neigh->mac) {
-              if (match_devicetype($neigh->mac, 'phone_ouis')) {
-                  $remote_type = 'IP Phone: '. $remote_type
-                    if $remote_type !~ /ip.phone/i;
-              }
-              elsif (match_devicetype($neigh->mac, 'wap_ouis')) {
-                  $remote_type = 'AP: '. $remote_type
-                    if $remote_type !~ /^AP: /;
-              }
-          }
-
           $remote_port = $c_port->{$entry};
           if (defined $remote_port) {
               # clean weird characters
diff --git a/lib/App/Netdisco/Manual/Configuration.pod b/lib/App/Netdisco/Manual/Configuration.pod
index a40e78c2..e69aaad8 100644
--- a/lib/App/Netdisco/Manual/Configuration.pod
+++ b/lib/App/Netdisco/Manual/Configuration.pod
@@ -1260,18 +1260,6 @@ To find the received Platforms on an upstream device, run this command:
 
  ~netdisco/bin/netdisco-do show -d <IP-of-device> -e c_platform
 
-=head3 C<phone_ouis>
-
-Value: List of Strings. Default: Empty List.
-
-If you can't get C<phone_capabilities> or C<phone_platforms> to match, as a
-last ditch attempt you can match on the MAC address of the device (if it has
-one). This is a set of regular expressions matched against the whole MAC
-address (not only the OUI portion) in IEEE format. For example:
-
- phone_ouis:
-   - '^a4:0c:c3'
-
 =head3 C<wap_capabilities>
 
 Value: List of Strings. Default:
@@ -1304,18 +1292,6 @@ To find the received Platforms on an upstream device, run this command:
 
  ~netdisco/bin/netdisco-do show -d <IP-of-device> -e c_platform
 
-=head3 C<wap_ouis>
-
-Value: List of Strings. Default: Empty List.
-
-If you can't get C<wap_capabilities> or C<wap_platforms> to match, as a last
-ditch attempt you can match on the MAC address of the device (if it has one).
-This is a set of regular expressions matched against the whole MAC address
-(not only the OUI portion) in IEEE format. For example:
-
- wap_ouis:
-   - '^a4:0c:c3'
-
 =head2 Backend Daemon
 
 =head3 C<workers>
@@ -1475,6 +1451,14 @@ These settings are from Netdisco 1.x but are yet to be supported in Netdisco
 
 =item *
 
+C<phone_ouis>
+
+=item *
+
+C<wap_ouis>
+
+=item *
+
 C<col_xxx_show>
 
 =item *
diff --git a/share/config.yml b/share/config.yml
index 0425f214..b9f4a6f6 100644
--- a/share/config.yml
+++ b/share/config.yml
@@ -192,14 +192,12 @@ phone_capabilities:
   - '(?i:phone)'
 phone_platforms:
   - '(?i:mitel.5\d{3})'
-phone_ouis: []
 wap_capabilities:
   - 'wlanAccessPoint'
 wap_platforms:
   - '(?i:\bw?ap\b)'
   - 'cisco\s+AIR-[L|C]?AP'
   - '-K9W8-'
-wap_ouis: []
 
 # --------------
 # BACKEND DAEMON