diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 3e60d1509c..9743b11b7f 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -532,7 +532,7 @@ void DomainServer::addReleasedAssignmentBackToQueue(Assignment* releasedAssignme
 void DomainServer::nodeKilled(SharedNodePointer node) {
     // if this node has linked data it was from an assignment
     if (node->getLinkedData()) {
-        Assignment* nodeAssignment =  (Assignment*) node->getLinkedData();
+        Assignment* nodeAssignment = (Assignment*) node->getLinkedData();
 
         addReleasedAssignmentBackToQueue(nodeAssignment);
     }
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 2d15c2bfda..dbf7d5ee25 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -92,11 +92,6 @@ Avatar::~Avatar() {
     _handData = NULL;
 }
 
-void Avatar::deleteOrDeleteLater() {
-    this->deleteLater();
-}
-
-
 void Avatar::init() {
     _head.init();
     _hand.init();
diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h
index ec575be462..9b0dc54571 100755
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@@ -72,7 +72,6 @@ public:
 
     Avatar(Node* owningNode = NULL);
     ~Avatar();
-    void deleteOrDeleteLater();
 
     void init();
     void simulate(float deltaTime, Transmitter* transmitter);
diff --git a/libraries/octree-server/src/OctreeServer.cpp b/libraries/octree-server/src/OctreeServer.cpp
index cc362f58a0..ef9e10cc83 100644
--- a/libraries/octree-server/src/OctreeServer.cpp
+++ b/libraries/octree-server/src/OctreeServer.cpp
@@ -28,17 +28,6 @@ void OctreeServer::attachQueryNodeToNode(Node* newNode) {
     }
 }
 
-void OctreeServer::nodeKilled(SharedNodePointer node) {
-    // Use this to cleanup our node
-    if (node->getType() == NODE_TYPE_AGENT) {
-        OctreeQueryNode* nodeData = (OctreeQueryNode*)node->getLinkedData();
-        if (nodeData) {
-            node->setLinkedData(NULL);
-            delete nodeData;
-        }
-    }
-};
-
 OctreeServer::OctreeServer(const unsigned char* dataBuffer, int numBytes) :
     ThreadedAssignment(dataBuffer, numBytes),
     _argc(0),
@@ -573,8 +562,6 @@ void OctreeServer::run() {
 
     setvbuf(stdout, NULL, _IOLBF, 0);
 
-    // tell our NodeList about our desire to get notifications
-    connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), this, SLOT(nodeKilled(SharedNodePointer)));
     nodeList->linkedDataCreateCallback = &OctreeServer::attachQueryNodeToNode;
 
     srand((unsigned)time(0));
diff --git a/libraries/octree-server/src/OctreeServer.h b/libraries/octree-server/src/OctreeServer.h
index c68f09b6e0..aae145c45e 100644
--- a/libraries/octree-server/src/OctreeServer.h
+++ b/libraries/octree-server/src/OctreeServer.h
@@ -69,8 +69,6 @@ public slots:
     void run();
     void processDatagram(const QByteArray& dataByteArray, const HifiSockAddr& senderSockAddr);
 
-    void nodeKilled(SharedNodePointer node);
-
 protected:
     void parsePayload();
     void initHTTPManager(int port);
diff --git a/libraries/octree/src/JurisdictionListener.h b/libraries/octree/src/JurisdictionListener.h
index c112f43b52..63b62c9bf7 100644
--- a/libraries/octree/src/JurisdictionListener.h
+++ b/libraries/octree/src/JurisdictionListener.h
@@ -23,6 +23,7 @@
 /// within the domain. As with other ReceivedPacketProcessor classes the user is responsible for reading inbound packets
 /// and adding them to the processing queue by calling queueReceivedPacket()
 class JurisdictionListener : public ReceivedPacketProcessor {
+    Q_OBJECT
 public:
     static const int DEFAULT_PACKETS_PER_SECOND = 1;
     static const int NO_SERVER_CHECK_RATE = 60; // if no servers yet detected, keep checking at 60fps
diff --git a/libraries/shared/src/Node.cpp b/libraries/shared/src/Node.cpp
index fa8bf0ef8f..603e1febba 100644
--- a/libraries/shared/src/Node.cpp
+++ b/libraries/shared/src/Node.cpp
@@ -39,7 +39,7 @@ Node::Node(const QUuid& uuid, char type, const HifiSockAddr& publicSocket, const
 
 Node::~Node() {
     if (_linkedData) {
-        _linkedData->deleteOrDeleteLater();
+        delete _linkedData;
     }
 
     delete _bytesReceivedMovingAverage;
diff --git a/libraries/shared/src/NodeData.cpp b/libraries/shared/src/NodeData.cpp
index 6ab7f2242b..45e8357d4f 100644
--- a/libraries/shared/src/NodeData.cpp
+++ b/libraries/shared/src/NodeData.cpp
@@ -16,8 +16,4 @@ NodeData::NodeData(Node* owningNode) :
 
 NodeData::~NodeData() {
 
-}
-
-void NodeData::deleteOrDeleteLater() {
-    delete this;
 }
\ No newline at end of file
diff --git a/libraries/shared/src/NodeData.h b/libraries/shared/src/NodeData.h
index 252b03ccc5..0488a6fd67 100644
--- a/libraries/shared/src/NodeData.h
+++ b/libraries/shared/src/NodeData.h
@@ -21,8 +21,6 @@ public:
     virtual ~NodeData() = 0;
     virtual int parseData(unsigned char* sourceBuffer, int numBytes) = 0;
     
-    virtual void deleteOrDeleteLater();
-    
     Node* getOwningNode() { return _owningNode; }
 protected:
     Node* _owningNode;