diff --git a/engine/server/library/serverDatabase/src/shared/Snapshot.cpp b/engine/server/library/serverDatabase/src/shared/Snapshot.cpp
index b1db9d33..768d8f99 100755
--- a/engine/server/library/serverDatabase/src/shared/Snapshot.cpp
+++ b/engine/server/library/serverDatabase/src/shared/Snapshot.cpp
@@ -42,12 +42,12 @@ Snapshot::~Snapshot()
 	for (LocatorListType::iterator i=m_locatorList.begin(); i!=m_locatorList.end(); ++i)
 	{
 		delete *i;
-		i = m_locatorList.erase(i);
+		*i = nullptr;
 	}
 
 	for (CustomStepListType::iterator j=m_customStepList.begin(); j!=m_customStepList.end(); ++j) {
 		delete *j;
-		j = m_customStepList.erase(j);
+		*j = nullptr;
 	}
 
 	++ms_deletionCount;
diff --git a/engine/server/library/serverDatabase/src/shared/TaskSaveSnapshot.cpp b/engine/server/library/serverDatabase/src/shared/TaskSaveSnapshot.cpp
index a9f7c906..2222b250 100755
--- a/engine/server/library/serverDatabase/src/shared/TaskSaveSnapshot.cpp
+++ b/engine/server/library/serverDatabase/src/shared/TaskSaveSnapshot.cpp
@@ -10,7 +10,6 @@
 
 #include "serverDatabase/Persister.h"
 #include "serverDatabase/Snapshot.h"
-#include "sharedFoundation/NetworkIdArchive.h" //TODO:  Windows build breaks without this.  Why?  Makes no sense.
 
 // ======================================================================
 
@@ -31,8 +30,6 @@ void TaskSaveSnapshot::onComplete()
 {
 	m_snapshot->saveCompleted();
 	Persister::getInstance().saveCompleted(m_snapshot);
-	delete m_snapshot;
-	m_snapshot = nullptr;
 }
 
 // ======================================================================
diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp
index eee98f61..f81f75ad 100755
--- a/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp
+++ b/game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp
@@ -139,10 +139,7 @@ SwgSnapshot::SwgSnapshot(DB::ModeQuery::Mode mode, bool useGoldDatabase) :
 
 // ----------------------------------------------------------------------
 
-SwgSnapshot::~SwgSnapshot()
-{
-	m_objvarBuffer.~ObjvarBuffer();
-}
+SwgSnapshot::~SwgSnapshot(){}
 
 // ----------------------------------------------------------------------