diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index bf831ef370..be63447cbe 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -126,36 +126,10 @@ QString nameForPacketType(PacketType::Value packetType) {
     return QString("unexpected");
 }
 
-int numBytesForPacketHeader(const QByteArray& packet) {
-    PacketType::Value packetType = packetTypeForPacket(packet);
-    return numBytesForPacketHeaderGivenPacketType(packetType);
-}
-
-int numBytesForPacketHeader(const char* packet) {
-    PacketType::Value packetType = packetTypeForPacket(packet);
-    return numBytesForPacketHeaderGivenPacketType(packetType);
-}
-
 int numBytesForArithmeticCodedPacketType(PacketType::Value packetType) {
     return (int) ceilf((float) packetType / 255);
 }
 
-int numBytesForPacketHeaderGivenPacketType(PacketType::Value packetType) {
-    return numBytesForArithmeticCodedPacketType(packetType)
-    + numHashBytesForType(packetType)
-    + numSequenceNumberBytesForType(packetType)
-    + NUM_STATIC_HEADER_BYTES;
-}
-
-int numHashBytesForType(PacketType::Value packetType) {
-    return (NON_VERIFIED_PACKETS.contains(packetType) ? 0 : NUM_BYTES_MD5_HASH);
-}
-
-int numSequenceNumberBytesForType(PacketType::Value packetType) {
-    return (SEQUENCE_NUMBERED_PACKETS.contains(packetType) ? sizeof(PacketSequenceNumber) : 0);
-}
-
-
 PacketType::Value packetTypeForPacket(const QByteArray& packet) {
     return (PacketType::Value) arithmeticCodingValueFromBuffer(packet.data());
 }
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 8ab73a9554..c76b7178e4 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -92,13 +92,7 @@ extern const QSet<PacketType::Value> SEQUENCE_NUMBERED_PACKETS;
 extern const QSet<PacketType::Value> NON_SOURCED_PACKETS;
 
 const int NUM_BYTES_MD5_HASH = 16;
-const int NUM_STATIC_HEADER_BYTES = sizeof(PacketVersion) + NUM_BYTES_RFC4122_UUID;
-const int MAX_PACKET_HEADER_BYTES = sizeof(PacketType::Value) + NUM_BYTES_MD5_HASH + NUM_STATIC_HEADER_BYTES;
 
-PacketType::Value packetTypeForPacket(const QByteArray& packet);
-PacketType::Value packetTypeForPacket(const char* packet);
-
-PacketVersion versionForPacketType(PacketType::Value packetType);
 QString nameForPacketType(PacketType::Value packetType);
 
 const QUuid nullUUID = QUuid();
diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp
index 6875e31d1e..e2e17a6606 100644
--- a/libraries/octree/src/OctreeEditPacketSender.cpp
+++ b/libraries/octree/src/OctreeEditPacketSender.cpp
@@ -346,7 +346,7 @@ void OctreeEditPacketSender::processNackPacket(NLPacket& packet, SharedNodePoint
     if (_sentPacketHistories.count(sendingNode->getUUID()) == 0) {
         return;
     }
-    const SentPacketHistory& sentPacketHistory = _sentPacketHistories[sendingNode->getSourceID()];
+    const SentPacketHistory& sentPacketHistory = _sentPacketHistories[sendingNode->getUUID()];
 
     // read sequence numbers and queue packets for resend
     while (packet.bytesLeftToRead() > 0) {