--- a/cisco/CISCO-AAA-SESSION-MIB.my
+++ b/cisco/CISCO-AAA-SESSION-MIB.my
@@ -3,7 +3,7 @@
 --
 -- November 1999, Ed Richardson
 --
--- Copyright (c) 1999, 2000, 2002, 2006 by cisco Systems, Inc.
+-- Copyright (c) 1999, 2000 by cisco Systems, Inc.
 -- All rights reserved.
 -- *****************************************************************
 --
@@ -16,25 +16,23 @@
         OBJECT-TYPE,
         Counter32,
         Gauge32,
-        IpAddress,
-        Unsigned32
+        IpAddress
                 FROM SNMPv2-SMI
         MODULE-COMPLIANCE,
         OBJECT-GROUP
                 FROM SNMPv2-CONF
         DisplayString,
         TruthValue,
-        TEXTUAL-CONVENTION,
-        RowPointer
+        TEXTUAL-CONVENTION
                 FROM SNMPv2-TC
-        InterfaceIndexOrZero
-                FROM IF-MIB
+        Unsigned32
+               FROM CISCO-TC
         ciscoMgmt
                 FROM CISCO-SMI;
  
 
 ciscoAAASessionMIB MODULE-IDENTITY
-        LAST-UPDATED    "200603210000Z"
+        LAST-UPDATED    "9911160000Z"
         ORGANIZATION    "Cisco Systems, Inc."
         CONTACT-INFO
                 "       Cisco Systems
@@ -44,13 +42,13 @@
                         San Jose, CA  95134
                         USA
  
-                   Tel: +1 800 553-NETS
+                Tel: +1 800 553-NETS
  
                 E-mail: cs-aaa@cisco.com"
         DESCRIPTION
                 "This MIB module provides data for accounting sessions
-                 based on Authentication, Authorization, Accounting
-                 (AAA) protocols.
+                 based on Authentication, Authorization, Accounting (AAA)
+                 protocols.
 
 
                  References:
@@ -59,15 +57,6 @@
 
 
                 "
-        REVISION        "200603210000Z"
-        DESCRIPTION
-        "Added the casnNasPort and casnVaiIfIndex objects to the
-         casnActiveTable.
-        "
-        REVISION        "200204110000Z"
-        DESCRIPTION
-        "Imported Unsigned32 from SNMPv2-SMI instead of CISCO-TC
-        "
         REVISION        "9911160000Z"
         DESCRIPTION
         "Initial version
@@ -123,9 +112,9 @@
 
 
 
---**********************************************************************
+--****************************************************************************
 -- AAA Session Active Group
---**********************************************************************
+--****************************************************************************
 --
 --
 
@@ -195,9 +184,7 @@
             casnIpAddr                    IpAddress,
             casnIdleTime                  Gauge32,
             casnDisconnect                TruthValue,
-            casnCallTrackerId             CctCallId,
-            casnNasPort                   RowPointer,
-            casnVaiIfIndex                InterfaceIndexOrZero
+            casnCallTrackerId             CctCallId 
         }
 
 
@@ -301,56 +288,10 @@
         ::= { casnActiveEntry 6 }
 
 
-casnNasPort OBJECT-TYPE
-        SYNTAX  RowPointer 
-        MAX-ACCESS  read-only
-        STATUS current
-        DESCRIPTION
-             "The value of this object identifies a particular
-              conceptual row associated with the session identified by
-              casnSessionId.  The conceptual row that this object points
-              to represents a port that is used to transport a session.
-
-              If the port transporting the session cannot be determined,
-              the value of this object will be zeroDotZero.
-
-              For example, suppose a session is established using an ATM
-              PVC.  If the ifIndex of the ATM interface is 7, and the 
-              VPI/VCI values of the PVC are 1, 100 respectively, then
-              the value of this object might be as follows:
-
-                     casnNasPort.15 = atmVclAdminStatus.7.1.100
-                                 ^                      ^ ^  ^
-                                 |                      | |  |
-                 casnSessionId --+                      | |  |
-                       ifIndex -------------------------+ |  |
-                     atmVclVpi ---------------------------+  |
-                     atmVclVci ------------------------------+
-
-              where atmVclAdminStatus is the first accessible object
-              of the atmVclTable of the ATM-MIB.
-             "
-        ::= { casnActiveEntry 7 }
-
-
-casnVaiIfIndex OBJECT-TYPE
-        SYNTAX  InterfaceIndexOrZero 
-        MAX-ACCESS  read-only
-        STATUS current
-        DESCRIPTION
-             "The ifIndex of the Virtual Access Interface (VAI)
-              that is associated with the PPP session.
-
-              This interface may not be represented in the IF-MIB in
-              which case the value of this object will be zero.
-             "
-        ::= { casnActiveEntry 8 }
-
-
-
---**********************************************************************
+
+--****************************************************************************
 -- AAA Session General Group
---**********************************************************************
+--****************************************************************************
 --
 --
 
@@ -359,8 +300,7 @@
         MAX-ACCESS  read-only
         STATUS      current
         DESCRIPTION
-             "Total number of sessions since last system
-              re-initialization.
+             "Total number of sessions since last system re-initialization.
  
               This value includes all sessions currently in the
               casnActiveTable and all previous sessions whether
@@ -378,22 +318,19 @@
             "Total number of sessions which have been disconnected using
              casnDisconnect since last system re-initialization.
 
-             This value includes any sessions still in the
-             casnActiveTable with a casnDisconnect value of true(1) and
-             all previous sessions which terminated as a result of
-             setting casnDisconnect.
+             This value includes any sessions still in the casnActiveTable
+             with a casnDisconnect value of true(1) and all previous sessions
+             which terminated as a result of setting casnDisconnect.
             "
         ::= { casnGeneral 2 }
 
 
 
---**********************************************************************
+--****************************************************************************
 -- Notifications
---**********************************************************************
-casnMIBNotificationPrefix  OBJECT IDENTIFIER ::=
-                                { ciscoAAASessionMIB 2 }
-casnMIBNotifications       OBJECT IDENTIFIER ::=
-                                { casnMIBNotificationPrefix 1 }
+--****************************************************************************
+casnMIBNotificationPrefix  OBJECT IDENTIFIER ::= { ciscoAAASessionMIB 2 }
+casnMIBNotifications       OBJECT IDENTIFIER ::= { casnMIBNotificationPrefix 1 }
 
 
 
@@ -407,7 +344,7 @@
 -- compliance statements
 
 casnMIBCompliance MODULE-COMPLIANCE
-        STATUS      deprecated
+        STATUS      current
         DESCRIPTION
             "The compliance statement for entities which
              implement the CISCO AAA Session MIB"
@@ -423,26 +360,6 @@
             "Write access is not required."
 
         ::= { casnMIBCompliances 1 }
-
-
-casnMIBComplianceRev1 MODULE-COMPLIANCE
-        STATUS      current
-        DESCRIPTION
-            "The compliance statement for entities which
-             implement the CISCO AAA Session MIB"
-        MODULE      -- this module
-        MANDATORY-GROUPS
-            { casnActiveGroup,
-              casnGeneralGroup,
-              casnActiveGroupSup1
-            }
-
-        OBJECT   casnDisconnect
-        MIN-ACCESS  read-only
-        DESCRIPTION
-            "Write access is not required."
-
-        ::= { casnMIBCompliances 2 }
 
 
 
@@ -478,17 +395,5 @@
              AAA session information.
             "
         ::= { casnMIBGroups 2 }
-
-
-casnActiveGroupSup1 OBJECT-GROUP
-        OBJECTS {
-            casnNasPort,
-            casnVaiIfIndex
-        }
-        STATUS      current
-        DESCRIPTION
-            "A collection of objects that supplements
-             the casnActiveGroup.
-            "
-        ::= { casnMIBGroups 3 }
 END
+