diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc
index 64147d836..c6817899a 100644
--- a/src/wifi/model/ap-wifi-mac.cc
+++ b/src/wifi/model/ap-wifi-mac.cc
@@ -183,13 +183,6 @@ ApWifiMac::SetBeaconInterval (Time interval)
   m_beaconInterval = interval;
 }
 
-void
-ApWifiMac::StartBeaconing (void)
-{
-  NS_LOG_FUNCTION (this);
-  SendOneBeacon ();
-}
-
 int64_t
 ApWifiMac::AssignStreams (int64_t stream)
 {
diff --git a/src/wifi/model/ap-wifi-mac.h b/src/wifi/model/ap-wifi-mac.h
index 7d99e7213..a853fb44a 100644
--- a/src/wifi/model/ap-wifi-mac.h
+++ b/src/wifi/model/ap-wifi-mac.h
@@ -100,10 +100,6 @@ public:
    * \return the interval between two beacon transmissions.
    */
   Time GetBeaconInterval (void) const;
-  /**
-   * Start beacon transmission immediately.
-   */
-  void StartBeaconing (void);
   /**
    * Determine whether short slot time should be enabled or not in the BSS.
    * Typically, true is returned only when there is no non-erp stations associated
diff --git a/src/wifi/model/block-ack-manager.cc b/src/wifi/model/block-ack-manager.cc
index 5788ca0ff..4b0aed9e0 100644
--- a/src/wifi/model/block-ack-manager.cc
+++ b/src/wifi/model/block-ack-manager.cc
@@ -841,35 +841,6 @@ BlockAckManager::TearDownBlockAck (Mac48Address recipient, uint8_t tid)
   DestroyAgreement (recipient, tid);
 }
 
-bool
-BlockAckManager::HasOtherFragments (uint16_t sequenceNumber) const
-{
-  NS_LOG_FUNCTION (this << sequenceNumber);
-  bool retVal = false;
-  if (m_retryPackets.size () > 0)
-    {
-      Item next = *(m_retryPackets.front ());
-      if (next.hdr.GetSequenceNumber () == sequenceNumber)
-        {
-          retVal = true;
-        }
-    }
-  return retVal;
-}
-
-uint32_t
-BlockAckManager::GetNextPacketSize (void) const
-{
-  NS_LOG_FUNCTION (this);
-  uint32_t size = 0;
-  if (m_retryPackets.size () > 0)
-    {
-      Item next = *(m_retryPackets.front ());
-      size = next.packet->GetSize ();
-    }
-  return size;
-}
-
 bool BlockAckManager::NeedBarRetransmission (uint8_t tid, uint16_t seqNumber, Mac48Address recipient)
 {
   //The standard says the BAR gets discarded when all MSDUs lifetime expires
diff --git a/src/wifi/model/block-ack-manager.h b/src/wifi/model/block-ack-manager.h
index 783808092..3703fd67f 100644
--- a/src/wifi/model/block-ack-manager.h
+++ b/src/wifi/model/block-ack-manager.h
@@ -285,22 +285,6 @@ public:
    * from recipient. The relative block ack agreement is destroyed.
    */
   void TearDownBlockAck (Mac48Address recipient, uint8_t tid);
-  /**
-   * \param sequenceNumber Sequence number of the packet which fragment is
-   * part of.
-   * \return true if another fragment with the given sequence number is scheduled
-   * for retransmission.
-   *
-   * Returns true if another fragment with sequence number <i>sequenceNumber</i> is scheduled
-   * for retransmission.
-   */
-  bool HasOtherFragments (uint16_t sequenceNumber) const;
-  /**
-   * \return the size of the next packet that needs retransmission
-   *
-   * Returns size of the next packet that needs retransmission.
-   */
-  uint32_t GetNextPacketSize (void) const;
   /**
    * \param maxDelay Max delay for a buffered packet.
    *
diff --git a/src/wifi/model/dca-txop.cc b/src/wifi/model/dca-txop.cc
index 68870b7fa..431538fcd 100644
--- a/src/wifi/model/dca-txop.cc
+++ b/src/wifi/model/dca-txop.cc
@@ -353,13 +353,6 @@ DcaTxop::GetFragmentPacket (WifiMacHeader *hdr)
   return fragment;
 }
 
-bool
-DcaTxop::NeedsAccess (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return !m_queue->IsEmpty () || m_currentPacket != 0;
-}
-
 void
 DcaTxop::NotifyAccessGranted (void)
 {
diff --git a/src/wifi/model/dca-txop.h b/src/wifi/model/dca-txop.h
index ed45a0409..6e8d39fa5 100644
--- a/src/wifi/model/dca-txop.h
+++ b/src/wifi/model/dca-txop.h
@@ -300,14 +300,6 @@ protected:
   virtual void DoInitialize (void);
 
   /* dcf notifications forwarded here */
-  /**
-   * Check if the DCF requires access.
-   *
-   * \return true if the DCF requires access,
-   *         false otherwise
-   */
-  virtual bool NeedsAccess (void) const;
-
   /**
    * Notify the DCF that access has been granted.
    */
diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc
index 6cf9e48db..17fbd194c 100644
--- a/src/wifi/model/edca-txop-n.cc
+++ b/src/wifi/model/edca-txop-n.cc
@@ -106,18 +106,6 @@ EdcaTxopN::GetBaAgreementExists (Mac48Address address, uint8_t tid) const
   return m_baManager->ExistsAgreement (address, tid);
 }
 
-uint32_t
-EdcaTxopN::GetNOutstandingPacketsInBa (Mac48Address address, uint8_t tid) const
-{
-  return m_baManager->GetNBufferedPackets (address, tid);
-}
-
-uint32_t
-EdcaTxopN::GetNRetryNeededPackets (Mac48Address recipient, uint8_t tid) const
-{
-  return m_baManager->GetNRetryNeededPackets (recipient, tid);
-}
-
 void
 EdcaTxopN::CompleteAmpduTransfer (Mac48Address recipient, uint8_t tid)
 {
@@ -146,13 +134,6 @@ EdcaTxopN::GetTypeOfStation (void) const
   return m_typeOfStation;
 }
 
-bool
-EdcaTxopN::NeedsAccess (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return !m_queue->IsEmpty () || m_currentPacket != 0 || m_baManager->HasPackets ();
-}
-
 uint16_t EdcaTxopN::GetNextSequenceNumberFor (WifiMacHeader *hdr)
 {
   return m_txMiddle->GetNextSequenceNumberFor (hdr);
diff --git a/src/wifi/model/edca-txop-n.h b/src/wifi/model/edca-txop-n.h
index 52599d89d..e40d45d8d 100644
--- a/src/wifi/model/edca-txop-n.h
+++ b/src/wifi/model/edca-txop-n.h
@@ -131,24 +131,6 @@ public:
    * <i>recipient</i> for tid <i>tid</i>.
    */
   bool GetBaAgreementExists (Mac48Address address, uint8_t tid) const;
-  /**
-   * \param address recipient address of peer station involved in block ack mechanism.
-   * \param tid traffic ID.
-   *
-   * \return the number of packets buffered for a specified agreement.
-   *
-   * Returns number of packets buffered for a specified agreement.
-   */
-  uint32_t GetNOutstandingPacketsInBa (Mac48Address address, uint8_t tid) const;
-  /**
-   * \param recipient address of peer station involved in block ack mechanism.
-   * \param tid traffic ID.
-   *
-   * \return the number of packets for a specific agreement that need retransmission.
-   *
-   * Returns number of packets for a specific agreement that need retransmission.
-   */
-  uint32_t GetNRetryNeededPackets (Mac48Address recipient, uint8_t tid) const;
   /**
    * \param recipient address of peer station involved in block ack mechanism.
    * \param tid Ttraffic ID of transmitted packet.
@@ -159,13 +141,6 @@ public:
   void CompleteAmpduTransfer (Mac48Address recipient, uint8_t tid);
 
   /* dcf notifications forwarded here */
-  /**
-   * Check if the EDCAF requires access.
-   *
-   * \return true if the EDCAF requires access,
-   *         false otherwise.
-   */
-  bool NeedsAccess (void) const;
   /**
    * Notify the EDCAF that access has been granted.
    */
diff --git a/src/wifi/model/interference-helper.cc b/src/wifi/model/interference-helper.cc
index eb4f99c3e..31db179a4 100644
--- a/src/wifi/model/interference-helper.cc
+++ b/src/wifi/model/interference-helper.cc
@@ -52,12 +52,6 @@ InterferenceHelper::Event::GetPacket (void) const
   return m_packet;
 }
 
-Time
-InterferenceHelper::Event::GetDuration (void) const
-{
-  return m_endTime - m_startTime;
-}
-
 Time
 InterferenceHelper::Event::GetStartTime (void) const
 {
diff --git a/src/wifi/model/interference-helper.h b/src/wifi/model/interference-helper.h
index 333a6f5eb..818d6da23 100644
--- a/src/wifi/model/interference-helper.h
+++ b/src/wifi/model/interference-helper.h
@@ -57,12 +57,6 @@ public:
      * \return the packet
      */
     Ptr<const Packet> GetPacket (void) const;
-    /**
-     * Return the duration of the signal.
-     *
-     * \return the duration of the signal
-     */
-    Time GetDuration (void) const;
     /**
      * Return the start time of the signal.
      *
diff --git a/src/wifi/model/mac-low.cc b/src/wifi/model/mac-low.cc
index 9ce319d25..d5513e469 100644
--- a/src/wifi/model/mac-low.cc
+++ b/src/wifi/model/mac-low.cc
@@ -1252,12 +1252,6 @@ MacLow::GetSize (Ptr<const Packet> packet, const WifiMacHeader *hdr, bool isAmpd
   return size;
 }
 
-WifiTxVector
-MacLow::GetCtsToSelfTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const
-{
-  return m_stationManager->GetCtsToSelfTxVector (hdr, packet);
-}
-
 WifiTxVector
 MacLow::GetRtsTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const
 {
diff --git a/src/wifi/model/mac-low.h b/src/wifi/model/mac-low.h
index 92789240b..0f96833d1 100644
--- a/src/wifi/model/mac-low.h
+++ b/src/wifi/model/mac-low.h
@@ -715,16 +715,6 @@ private:
    * \return TXVECTOR for the Block ACK
    */
   WifiTxVector GetBlockAckTxVector (Mac48Address to, WifiMode dataTxMode) const;
-  /**
-   * Return a TXVECTOR for the CTS-to-self frame.
-   * The function consults WifiRemoteStationManager, which controls the rate
-   * to different destinations.
-   *
-   * \param packet the packet that requires CTS-to-self
-   * \param hdr the Wifi header of the packet
-   * \return TXVECTOR for the CTS-to-self operation
-   */
-  WifiTxVector GetCtsToSelfTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
   /**
    * Return a TXVECTOR for the CTS frame given the destination and the mode of the RTS
    * used by the sender.
diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc
index 6085caa8f..87eb351ca 100644
--- a/src/wifi/model/sta-wifi-mac.cc
+++ b/src/wifi/model/sta-wifi-mac.cc
@@ -105,34 +105,6 @@ StaWifiMac::~StaWifiMac ()
   NS_LOG_FUNCTION (this);
 }
 
-void
-StaWifiMac::SetMaxMissedBeacons (uint32_t missed)
-{
-  NS_LOG_FUNCTION (this << missed);
-  m_maxMissedBeacons = missed;
-}
-
-void
-StaWifiMac::SetProbeRequestTimeout (Time timeout)
-{
-  NS_LOG_FUNCTION (this << timeout);
-  m_probeRequestTimeout = timeout;
-}
-
-void
-StaWifiMac::SetAssocRequestTimeout (Time timeout)
-{
-  NS_LOG_FUNCTION (this << timeout);
-  m_assocRequestTimeout = timeout;
-}
-
-void
-StaWifiMac::StartActiveAssociation (void)
-{
-  NS_LOG_FUNCTION (this);
-  TryToEnsureAssociated ();
-}
-
 void
 StaWifiMac::SetActiveProbing (bool enable)
 {
diff --git a/src/wifi/model/sta-wifi-mac.h b/src/wifi/model/sta-wifi-mac.h
index 48a079ef8..7a84de69f 100644
--- a/src/wifi/model/sta-wifi-mac.h
+++ b/src/wifi/model/sta-wifi-mac.h
@@ -58,31 +58,6 @@ public:
    */
   void Enqueue (Ptr<const Packet> packet, Mac48Address to);
 
-  /**
-   * \param missed the number of beacons which must be missed
-   * before a new association sequence is started.
-   */
-  void SetMaxMissedBeacons (uint32_t missed);
-  /**
-   * \param timeout
-   *
-   * If no probe response is received within the specified
-   * timeout, the station sends a new probe request.
-   */
-  void SetProbeRequestTimeout (Time timeout);
-  /**
-   * \param timeout
-   *
-   * If no association response is received within the specified
-   * timeout, the station sends a new association request.
-   */
-  void SetAssocRequestTimeout (Time timeout);
-
-  /**
-   * Start an active association sequence immediately.
-   */
-  void StartActiveAssociation (void);
-
 
 private:
   /**