Initial redesign of internal data structures
diff --git a/model/ccnx-l3-protocol.h b/model/ccnx-l3-protocol.h
index 1d5a3af..4d01da2 100644
--- a/model/ccnx-l3-protocol.h
+++ b/model/ccnx-l3-protocol.h
@@ -160,20 +160,8 @@
   CcnxL3Protocol(const CcnxL3Protocol &); ///< copy constructor is disabled
   CcnxL3Protocol &operator = (const CcnxL3Protocol &); ///< copy operator is disabled
 
-  // /// \brief Set buckets leak interval
-  // void
-  // SetBucketLeakInterval (Time interval);
-
-  // /// \brief Get buckets leak interval
-  // Time
-  // GetBucketLeakInterval () const;
-  
-  // /// \brief Periodically generate pre-calculated number of tokens (leak buckets)
-  // void
-  // LeakBuckets ();
-
   void
-  GiveUpInterest (const CcnxPitEntry &pitEntry,
+  GiveUpInterest (CcnxPit::iterator pitEntry,
                   Ptr<CcnxInterestHeader> header);
 
   void