diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index a61a1e7491..87f6037e9e 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -85,7 +85,7 @@ void AssignmentClient::readPendingDatagrams() {
                     qDebug() << "Dropping received assignment since we are currently running one.\n";
                 } else {
                     // construct the deployed assignment from the packet data
-                    _currentAssignment = (ThreadedAssignment*) AssignmentFactory::unpackAssignment(packetData, receivedBytes);
+                    _currentAssignment = AssignmentFactory::unpackAssignment(packetData, receivedBytes);
                     
                     qDebug() << "Received an assignment -" << *_currentAssignment << "\n";
                     
diff --git a/assignment-client/src/AssignmentFactory.cpp b/assignment-client/src/AssignmentFactory.cpp
index a3aa657943..aa173f920f 100644
--- a/assignment-client/src/AssignmentFactory.cpp
+++ b/assignment-client/src/AssignmentFactory.cpp
@@ -15,7 +15,7 @@
 
 #include "AssignmentFactory.h"
 
-Assignment* AssignmentFactory::unpackAssignment(const unsigned char* dataBuffer, int numBytes) {
+ThreadedAssignment* AssignmentFactory::unpackAssignment(const unsigned char* dataBuffer, int numBytes) {
     int headerBytes = numBytesForPacketHeader(dataBuffer);
     
     Assignment::Type assignmentType = Assignment::AllTypes;
@@ -31,6 +31,6 @@ Assignment* AssignmentFactory::unpackAssignment(const unsigned char* dataBuffer,
         case Assignment::VoxelServerType:
             return new VoxelServer(dataBuffer, numBytes);
         default:
-            return new Assignment(dataBuffer, numBytes);
+            return NULL;
     }
 }
\ No newline at end of file
diff --git a/assignment-client/src/AssignmentFactory.h b/assignment-client/src/AssignmentFactory.h
index 8adadb07ed..4605d961ec 100644
--- a/assignment-client/src/AssignmentFactory.h
+++ b/assignment-client/src/AssignmentFactory.h
@@ -9,11 +9,11 @@
 #ifndef __hifi__AssignmentFactory__
 #define __hifi__AssignmentFactory__
 
-#include "Assignment.h"
+#include <ThreadedAssignment.h>
 
 class AssignmentFactory {
 public:
-    static Assignment* unpackAssignment(const unsigned char* dataBuffer, int numBytes);
+    static ThreadedAssignment* unpackAssignment(const unsigned char* dataBuffer, int numBytes);
 };
 
 #endif /* defined(__hifi__AssignmentFactory__) */
diff --git a/libraries/voxel-server-library/src/VoxelServer.cpp b/libraries/voxel-server-library/src/VoxelServer.cpp
index bbf0c2d54e..ebe298ccf1 100644
--- a/libraries/voxel-server-library/src/VoxelServer.cpp
+++ b/libraries/voxel-server-library/src/VoxelServer.cpp
@@ -692,9 +692,6 @@ void VoxelServer::run() {
     }
 
     HifiSockAddr senderSockAddr;
-    
-    unsigned char* packetData = new unsigned char[MAX_PACKET_SIZE];
-    ssize_t packetLength;
 
     // set up our jurisdiction broadcaster...
     _jurisdictionSender = new JurisdictionSender(_jurisdiction);