From 9148764d20fe553cdf8c3fe29dce9ef6442aa219 Mon Sep 17 00:00:00 2001
From: "Eric A. Miller" <emiller@cpan.org>
Date: Sun, 22 Jun 2014 09:31:44 -0400
Subject: [PATCH] Remove CiscoImage from all classes as its now included in
 CiscoStats class

---
 Info.pm                 |  6 ----
 Info/Layer3/C3550.pm    | 21 ++-----------
 Info/Layer3/C4000.pm    | 20 ++-----------
 Info/Layer3/C6500.pm    | 20 ++-----------
 Info/Layer3/Cisco.pm    | 20 ++-----------
 Info/Layer3/CiscoASA.pm | 65 +++++++++++++++++------------------------
 Info/Layer3/Nexus.pm    | 18 ------------
 7 files changed, 36 insertions(+), 134 deletions(-)

diff --git a/Info.pm b/Info.pm
index 601ac8bc..f9f711bb 100644
--- a/Info.pm
+++ b/Info.pm
@@ -282,12 +282,6 @@ These OIDs facilitate the writing of configuration files.
 
 See documentation in L<SNMP::Info::CiscoConfig> for details.
 
-=item SNMP::Info::CiscoImage
-
-F<CISCO-IMAGE-MIB>. A collection of OIDs providing IOS image characteristics.
-
-See documentation in L<SNMP::Info::CiscoImage> for details.
-
 =item SNMP::Info::CiscoPortSecurity
 
 F<CISCO-PORT-SECURITY-MIB> and F<CISCO-PAE-MIB>.
diff --git a/Info/Layer3/C3550.pm b/Info/Layer3/C3550.pm
index d3be1d40..f39afecd 100644
--- a/Info/Layer3/C3550.pm
+++ b/Info/Layer3/C3550.pm
@@ -39,7 +39,6 @@ use SNMP::Info::LLDP;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoConfig;
 use SNMP::Info::CiscoStats;
-use SNMP::Info::CiscoImage;
 use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::CiscoPower;
 use SNMP::Info::Layer3;
@@ -55,7 +54,6 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
     SNMP::Info::LLDP
     SNMP::Info::CDP
     SNMP::Info::CiscoStats
-    SNMP::Info::CiscoImage
     SNMP::Info::CiscoPortSecurity
     SNMP::Info::CiscoConfig
     SNMP::Info::CiscoPower
@@ -75,7 +73,7 @@ $VERSION = '3.15';
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,             %SNMP::Info::CiscoPower::MIBS,
     %SNMP::Info::CiscoConfig::MIBS,        %SNMP::Info::CiscoPortSecurity::MIBS,
-    %SNMP::Info::CiscoImage::MIBS,         %SNMP::Info::CiscoStats::MIBS,
+    %SNMP::Info::CiscoStats::MIBS,
     %SNMP::Info::LLDP::MIBS,               %SNMP::Info::CDP::MIBS,
     %SNMP::Info::CiscoStack::MIBS,         %SNMP::Info::CiscoStpExtensions::MIBS, 
     %SNMP::Info::CiscoVTP::MIBS,
@@ -87,7 +85,6 @@ $VERSION = '3.15';
     %SNMP::Info::CiscoPower::GLOBALS,
     %SNMP::Info::CiscoConfig::GLOBALS,
     %SNMP::Info::CiscoPortSecurity::GLOBALS,
-    %SNMP::Info::CiscoImage::GLOBALS,
     %SNMP::Info::CiscoStats::GLOBALS,
     %SNMP::Info::LLDP::GLOBALS,
     %SNMP::Info::CDP::GLOBALS,
@@ -99,7 +96,7 @@ $VERSION = '3.15';
 %FUNCS = (
     %SNMP::Info::Layer3::FUNCS,             %SNMP::Info::CiscoPower::FUNCS,
     %SNMP::Info::CiscoConfig::FUNCS,        %SNMP::Info::CiscoPortSecurity::FUNCS,
-    %SNMP::Info::CiscoImage::FUNCS,         %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CiscoStats::FUNCS,
     %SNMP::Info::LLDP::FUNCS,               %SNMP::Info::CDP::FUNCS,
     %SNMP::Info::CiscoStack::FUNCS,         %SNMP::Info::CiscoStpExtensions::FUNCS, 
     %SNMP::Info::CiscoVTP::FUNCS,    
@@ -108,7 +105,7 @@ $VERSION = '3.15';
 %MUNGE = (
     %SNMP::Info::Layer3::MUNGE,             %SNMP::Info::CiscoPower::MUNGE,
     %SNMP::Info::CiscoConfig::MUNGE,        %SNMP::Info::CiscoPortSecurity::MUNGE,
-    %SNMP::Info::CiscoImage::MUNGE,         %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE,
     %SNMP::Info::LLDP::MUNGE,               %SNMP::Info::CDP::MUNGE,
     %SNMP::Info::CiscoStack::MUNGE,         %SNMP::Info::CiscoStpExtensions::MUNGE, 
     %SNMP::Info::CiscoVTP::MUNGE,
@@ -299,8 +296,6 @@ after determining a more specific class using the method above.
 
 =item SNMP::Info::CiscoStats
 
-=item SNMP::Info::CiscoImage
-
 =back
 
 =head2 Required MIBs
@@ -324,8 +319,6 @@ See L<SNMP::Info::CiscoStack/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
 
-See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
-
 See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
@@ -395,10 +388,6 @@ See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
-
 =head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
@@ -481,8 +470,4 @@ See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
 
-=head2 Table Methods imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
-
 =cut
diff --git a/Info/Layer3/C4000.pm b/Info/Layer3/C4000.pm
index 50d7a9da..382e1ba8 100644
--- a/Info/Layer3/C4000.pm
+++ b/Info/Layer3/C4000.pm
@@ -35,14 +35,13 @@ use Exporter;
 use SNMP::Info::CiscoVTP;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
-use SNMP::Info::CiscoImage;
 use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::CiscoConfig;
 use SNMP::Info::MAU;
 use SNMP::Info::Layer3;
 
 @SNMP::Info::Layer3::C4000::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP
-    SNMP::Info::CiscoStats SNMP::Info::CiscoImage
+    SNMP::Info::CiscoStats
     SNMP::Info::CiscoPortSecurity
     SNMP::Info::CiscoConfig SNMP::Info::MAU
     SNMP::Info::Layer3 Exporter/;
@@ -57,7 +56,6 @@ $VERSION = '3.15';
     %SNMP::Info::MAU::MIBS,
     %SNMP::Info::CiscoConfig::MIBS,
     %SNMP::Info::CiscoPortSecurity::MIBS,
-    %SNMP::Info::CiscoImage::MIBS,
     %SNMP::Info::CiscoStats::MIBS,
     %SNMP::Info::CDP::MIBS,
     %SNMP::Info::CiscoVTP::MIBS,
@@ -69,7 +67,6 @@ $VERSION = '3.15';
     %SNMP::Info::MAU::GLOBALS,
     %SNMP::Info::CiscoConfig::GLOBALS,
     %SNMP::Info::CiscoPortSecurity::GLOBALS,
-    %SNMP::Info::CiscoImage::GLOBALS,
     %SNMP::Info::CiscoStats::GLOBALS,
     %SNMP::Info::CDP::GLOBALS,
     %SNMP::Info::CiscoVTP::GLOBALS,
@@ -84,7 +81,6 @@ $VERSION = '3.15';
     %SNMP::Info::MAU::FUNCS,
     %SNMP::Info::CiscoConfig::FUNCS,
     %SNMP::Info::CiscoPortSecurity::FUNCS,
-    %SNMP::Info::CiscoImage::FUNCS,
     %SNMP::Info::CiscoStats::FUNCS,
     %SNMP::Info::CDP::FUNCS,
     %SNMP::Info::CiscoVTP::FUNCS,
@@ -95,7 +91,7 @@ $VERSION = '3.15';
 %MUNGE = (
     %SNMP::Info::Layer3::MUNGE,      %SNMP::Info::MAU::MUNGE,
     %SNMP::Info::CiscoConfig::MUNGE, %SNMP::Info::CiscoPortSecurity::MUNGE,
-    %SNMP::Info::CiscoImage::MUNGE,  %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE,
     %SNMP::Info::CDP::MUNGE,         %SNMP::Info::CiscoVTP::MUNGE,
 );
 
@@ -175,8 +171,6 @@ after determining a more specific class using the method above.
 
 =item SNMP::Info::CiscoStats
 
-=item SNMP::Info::CiscoImage
-
 =item SNMP::Info::CiscoPortSecurity
 
 =item SNMP::Info::CiscoConfig
@@ -199,8 +193,6 @@ See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
 
-See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
-
 See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB
 requirements.
 
@@ -242,10 +234,6 @@ See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
-
 =head2 Globals imported from SNMP::Info::CiscoPortSecurity
 
 See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
@@ -313,10 +301,6 @@ See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
 
-=head2 Table Methods imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
-
 =head2 Table Methods imported from SNMP::Info::CiscoPortSecurity
 
 See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for
diff --git a/Info/Layer3/C6500.pm b/Info/Layer3/C6500.pm
index a8600edb..a2866db1 100644
--- a/Info/Layer3/C6500.pm
+++ b/Info/Layer3/C6500.pm
@@ -36,7 +36,6 @@ use SNMP::Info::CiscoStack;
 use SNMP::Info::LLDP;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
-use SNMP::Info::CiscoImage;
 use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::CiscoConfig;
 use SNMP::Info::CiscoPower;
@@ -56,7 +55,6 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
     SNMP::Info::CiscoStack
     SNMP::Info::LLDP
     SNMP::Info::CDP 
-    SNMP::Info::CiscoImage
     SNMP::Info::CiscoStats
     SNMP::Info::CiscoPortSecurity
     SNMP::Info::CiscoConfig
@@ -84,7 +82,6 @@ $VERSION = '3.15';
     %SNMP::Info::CiscoPower::MIBS,
     %SNMP::Info::CiscoConfig::MIBS,
     %SNMP::Info::CiscoPortSecurity::MIBS,
-    %SNMP::Info::CiscoImage::MIBS,
     %SNMP::Info::CiscoStats::MIBS,
     %SNMP::Info::CDP::MIBS,
     %SNMP::Info::LLDP::MIBS,
@@ -101,7 +98,6 @@ $VERSION = '3.15';
     %SNMP::Info::CiscoPower::GLOBALS,
     %SNMP::Info::CiscoConfig::GLOBALS,
     %SNMP::Info::CiscoPortSecurity::GLOBALS,
-    %SNMP::Info::CiscoImage::GLOBALS,
     %SNMP::Info::CiscoStats::GLOBALS,
     %SNMP::Info::CDP::GLOBALS,
     %SNMP::Info::LLDP::GLOBALS,
@@ -113,7 +109,7 @@ $VERSION = '3.15';
 %FUNCS = (
     %SNMP::Info::MAU::FUNCS,                %SNMP::Info::Layer3::FUNCS,
     %SNMP::Info::CiscoPower::FUNCS,         %SNMP::Info::CiscoConfig::FUNCS,
-    %SNMP::Info::CiscoPortSecurity::FUNCS,  %SNMP::Info::CiscoImage::FUNCS,
+    %SNMP::Info::CiscoPortSecurity::FUNCS, 
     %SNMP::Info::CiscoStats::FUNCS,         %SNMP::Info::CDP::FUNCS,
     %SNMP::Info::LLDP::FUNCS,               %SNMP::Info::CiscoStack::FUNCS,
     %SNMP::Info::CiscoStpExtensions::FUNCS, %SNMP::Info::CiscoVTP::FUNCS,
@@ -122,7 +118,7 @@ $VERSION = '3.15';
 %MUNGE = (
     %SNMP::Info::MAU::MUNGE,                %SNMP::Info::Layer3::MUNGE,
     %SNMP::Info::CiscoPower::MUNGE,         %SNMP::Info::CiscoConfig::MUNGE,
-    %SNMP::Info::CiscoPortSecurity::MUNGE,  %SNMP::Info::CiscoImage::MUNGE,
+    %SNMP::Info::CiscoPortSecurity::MUNGE, 
     %SNMP::Info::CiscoStats::MUNGE,         %SNMP::Info::CDP::MUNGE,
     %SNMP::Info::LLDP::MUNGE,               %SNMP::Info::CiscoStack::MUNGE,
     %SNMP::Info::CiscoStpExtensions::MUNGE, %SNMP::Info::CiscoVTP::MUNGE,
@@ -339,8 +335,6 @@ after determining a more specific class using the method above.
 
 =item SNMP::Info::CiscoStats
 
-=item SNMP::Info::CiscoImage
-
 =item SNMP::Info::CiscoPortSecurity
 
 =item SNMP::Info::CiscoConfig
@@ -369,8 +363,6 @@ See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
 
-See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
-
 See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB
 requirements.
 
@@ -428,10 +420,6 @@ See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
-
 =head2 Globals imported from SNMP::Info::CiscoPortSecurity
 
 See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
@@ -521,10 +509,6 @@ See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
 
-=head2 Table Methods imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
-
 =head2 Table Methods imported from SNMP::Info::CiscoPortSecurity
 
 See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for
diff --git a/Info/Layer3/Cisco.pm b/Info/Layer3/Cisco.pm
index 802d6c79..53b0aead 100644
--- a/Info/Layer3/Cisco.pm
+++ b/Info/Layer3/Cisco.pm
@@ -35,7 +35,6 @@ use Exporter;
 use SNMP::Info::CiscoVTP;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
-use SNMP::Info::CiscoImage;
 use SNMP::Info::CiscoRTT;
 use SNMP::Info::CiscoQOS;
 use SNMP::Info::CiscoConfig;
@@ -43,7 +42,7 @@ use SNMP::Info::CiscoPower;
 use SNMP::Info::Layer3;
 
 @SNMP::Info::Layer3::Cisco::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP
-    SNMP::Info::CiscoStats SNMP::Info::CiscoImage
+    SNMP::Info::CiscoStats 
     SNMP::Info::CiscoRTT  SNMP::Info::CiscoQOS
     SNMP::Info::CiscoConfig SNMP::Info::CiscoPower
     SNMP::Info::Layer3
@@ -60,7 +59,6 @@ $VERSION = '3.15';
     %SNMP::Info::CiscoConfig::MIBS,
     %SNMP::Info::CiscoQOS::MIBS,
     %SNMP::Info::CiscoRTT::MIBS,
-    %SNMP::Info::CiscoImage::MIBS,
     %SNMP::Info::CiscoStats::MIBS,
     %SNMP::Info::CDP::MIBS,
     %SNMP::Info::CiscoVTP::MIBS,
@@ -70,7 +68,7 @@ $VERSION = '3.15';
 %GLOBALS = (
     %SNMP::Info::Layer3::GLOBALS,      %SNMP::Info::CiscoPower::GLOBALS,
     %SNMP::Info::CiscoConfig::GLOBALS, %SNMP::Info::CiscoQOS::GLOBALS,
-    %SNMP::Info::CiscoRTT::GLOBALS,    %SNMP::Info::CiscoImage::GLOBALS,
+    %SNMP::Info::CiscoRTT::GLOBALS, 
     %SNMP::Info::CiscoStats::GLOBALS,  %SNMP::Info::CDP::GLOBALS,
     %SNMP::Info::CiscoVTP::GLOBALS, 'eigrp_id' => 'cEigrpAsRouterId',
 );
@@ -81,7 +79,6 @@ $VERSION = '3.15';
     %SNMP::Info::CiscoConfig::FUNCS,
     %SNMP::Info::CiscoQOS::FUNCS,
     %SNMP::Info::CiscoRTT::FUNCS,
-    %SNMP::Info::CiscoImage::FUNCS,
     %SNMP::Info::CiscoStats::FUNCS,
     %SNMP::Info::CDP::FUNCS,
     %SNMP::Info::CiscoVTP::FUNCS,
@@ -96,7 +93,6 @@ $VERSION = '3.15';
     %SNMP::Info::CiscoConfig::MUNGE,
     %SNMP::Info::CiscoQOS::MUNGE,
     %SNMP::Info::CiscoRTT::MUNGE,
-    %SNMP::Info::CiscoImage::MUNGE,
     %SNMP::Info::CiscoStats::MUNGE,
     %SNMP::Info::CDP::MUNGE,
     %SNMP::Info::CiscoVTP::MUNGE,
@@ -163,8 +159,6 @@ Subclass for Generic Cisco Routers running IOS
 
 =item SNMP::Info::CiscoStats
 
-=item SNMP::Info::CiscoImage
-
 =item SNMP::Info::CiscoRTT
 
 =item SNMP::Info::CiscoQOS
@@ -191,8 +185,6 @@ See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
 
-See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
-
 See L<SNMP::Info::CiscoRTT/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::CiscoQOS/"Required MIBs"> for its own MIB requirements.
@@ -233,10 +225,6 @@ See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
-
 =head2 Globals imported from SNMP::Info::CiscoRTT
 
 See documentation in L<SNMP::Info::CiscoRTT/"GLOBALS"> for details.
@@ -288,10 +276,6 @@ See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
 
-=head2 Table Methods imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
-
 =head2 Table Methods imported from SNMP::Info::CiscoRTT
 
 See documentation in L<SNMP::Info::CiscoRTT/"TABLE METHODS"> for details.
diff --git a/Info/Layer3/CiscoASA.pm b/Info/Layer3/CiscoASA.pm
index 0174da8d..44de62e8 100644
--- a/Info/Layer3/CiscoASA.pm
+++ b/Info/Layer3/CiscoASA.pm
@@ -36,7 +36,6 @@ use Exporter;
 use SNMP::Info::CiscoVTP;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
-use SNMP::Info::CiscoImage;
 use SNMP::Info::CiscoRTT;
 use SNMP::Info::CiscoQOS;
 use SNMP::Info::CiscoConfig;
@@ -45,7 +44,7 @@ use SNMP::Info::Layer3;
 use SNMP::Info::Layer3::Cisco;
 
 @SNMP::Info::Layer3::CiscoASA::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP
-    SNMP::Info::CiscoStats SNMP::Info::CiscoImage
+    SNMP::Info::CiscoStats
     SNMP::Info::CiscoRTT  SNMP::Info::CiscoQOS
     SNMP::Info::CiscoConfig SNMP::Info::CiscoPower
     SNMP::Info::Layer3::Cisco
@@ -57,43 +56,41 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 $VERSION = '3.15';
 
-%MIBS = (
-       %SNMP::Info::Layer3::Cisco::MIBS,
-);
+%MIBS = ( %SNMP::Info::Layer3::Cisco::MIBS, );
 
-%GLOBALS = (
-       %SNMP::Info::Layer3::Cisco::GLOBALS,
-);
+%GLOBALS = ( %SNMP::Info::Layer3::Cisco::GLOBALS, );
 
-%FUNCS = (
-       %SNMP::Info::Layer3::Cisco::FUNCS,
-    'mac_table' => 'ifPhysAddress',
-);
+%FUNCS
+    = ( %SNMP::Info::Layer3::Cisco::FUNCS, 'mac_table' => 'ifPhysAddress', );
 
 %MUNGE = (
-       %SNMP::Info::Layer3::Cisco::MUNGE,
-    'mac_table'  => \&SNMP::Info::munge_mac, );
+    %SNMP::Info::Layer3::Cisco::MUNGE,
+    'mac_table' => \&SNMP::Info::munge_mac,
+);
 
 sub b_mac {
-       my ($asa) = shift;
-       my $macs = $asa->mac_table();
-       my @macs;
-       # gather physical addresses
-       foreach my $i ( keys %$macs ) {
-               my $mac = $macs->{$i};
-               # don't catch the bad macs with zeroed OUI
-               if ( $mac !~ m/(0{1,2}:){3}/ ) {
-                       push( @macs, $mac);
-               }
-               @macs = sort( @macs );
-       }
-       # return the least mac
-       return $macs[0];
+    my ($asa) = shift;
+    my $macs = $asa->mac_table();
+    my @macs;
+
+    # gather physical addresses
+    foreach my $i ( keys %$macs ) {
+        my $mac = $macs->{$i};
+
+        # don't catch the bad macs with zeroed OUI
+        if ( $mac !~ m/(0{1,2}:){3}/ ) {
+            push( @macs, $mac );
+        }
+        @macs = sort(@macs);
+    }
+
+    # return the least mac
+    return $macs[0];
 }
 
 sub i_description {
-    my $self = shift;
-    my $partial   = shift;
+    my $self    = shift;
+    my $partial = shift;
 
     my $i_descr = $self->orig_i_description($partial) || {};
 
@@ -188,10 +185,6 @@ See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
-
 =head2 Globals imported from SNMP::Info::CiscoRTT
 
 See documentation in L<SNMP::Info::CiscoRTT/"GLOBALS"> for details.
@@ -233,10 +226,6 @@ See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
 
-=head2 Table Methods imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
-
 =head2 Table Methods imported from SNMP::Info::CiscoRTT
 
 See documentation in L<SNMP::Info::CiscoRTT/"TABLE METHODS"> for details.
diff --git a/Info/Layer3/Nexus.pm b/Info/Layer3/Nexus.pm
index 3f5eeeff..c7557b64 100644
--- a/Info/Layer3/Nexus.pm
+++ b/Info/Layer3/Nexus.pm
@@ -33,7 +33,6 @@ use strict;
 use Exporter;
 use SNMP::Info::LLDP;
 use SNMP::Info::CDP;
-use SNMP::Info::CiscoImage;
 use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::CiscoConfig;
 use SNMP::Info::CiscoPower;
@@ -49,7 +48,6 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
     SNMP::Info::CiscoStpExtensions
     SNMP::Info::LLDP
     SNMP::Info::CDP 
-    SNMP::Info::CiscoImage
     SNMP::Info::CiscoPortSecurity
     SNMP::Info::CiscoConfig
     SNMP::Info::CiscoPower
@@ -74,7 +72,6 @@ $VERSION = '3.15';
     %SNMP::Info::CiscoPower::MIBS,
     %SNMP::Info::CiscoConfig::MIBS,
     %SNMP::Info::CiscoPortSecurity::MIBS,
-    %SNMP::Info::CiscoImage::MIBS,
     %SNMP::Info::CDP::MIBS,
     %SNMP::Info::LLDP::MIBS,
     %SNMP::Info::CiscoStpExtensions::MIBS, 
@@ -87,7 +84,6 @@ $VERSION = '3.15';
     %SNMP::Info::CiscoPower::GLOBALS,
     %SNMP::Info::CiscoConfig::GLOBALS,
     %SNMP::Info::CiscoPortSecurity::GLOBALS,
-    %SNMP::Info::CiscoImage::GLOBALS,
     %SNMP::Info::CDP::GLOBALS,
     %SNMP::Info::LLDP::GLOBALS,
     %SNMP::Info::CiscoStpExtensions::GLOBALS,
@@ -100,7 +96,6 @@ $VERSION = '3.15';
     %SNMP::Info::CiscoPower::FUNCS,
     %SNMP::Info::CiscoConfig::FUNCS,
     %SNMP::Info::CiscoPortSecurity::FUNCS,
-    %SNMP::Info::CiscoImage::FUNCS,
     %SNMP::Info::CDP::FUNCS,
     %SNMP::Info::LLDP::FUNCS,
     %SNMP::Info::CiscoStpExtensions::FUNCS, 
@@ -113,7 +108,6 @@ $VERSION = '3.15';
     %SNMP::Info::CiscoPower::MUNGE,
     %SNMP::Info::CiscoConfig::MUNGE,
     %SNMP::Info::CiscoPortSecurity::MUNGE,
-    %SNMP::Info::CiscoImage::MUNGE,         
     %SNMP::Info::CDP::MUNGE,
     %SNMP::Info::LLDP::MUNGE,
     %SNMP::Info::CiscoStpExtensions::MUNGE, 
@@ -288,8 +282,6 @@ after determining a more specific class using the method above.
 
 =item SNMP::Info::CDP
 
-=item SNMP::Info::CiscoImage
-
 =item SNMP::Info::CiscoPortSecurity
 
 =item SNMP::Info::CiscoConfig
@@ -320,8 +312,6 @@ See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
 
-See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
-
 See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB
 requirements.
 
@@ -421,10 +411,6 @@ See documentation in L<SNMP::Info::CiscoVTP/"GLOBALS"> for details.
 
 See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
-
 =head2 Globals imported from SNMP::Info::CiscoPortSecurity
 
 See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
@@ -466,10 +452,6 @@ See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
 
-=head2 Table Methods imported from SNMP::Info::CiscoImage
-
-See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
-
 =head2 Table Methods imported from SNMP::Info::CiscoPortSecurity
 
 See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for