diff --git a/engine/cl_demo.cpp b/engine/cl_demo.cpp
index f4417878..f7d96ec4 100644
--- a/engine/cl_demo.cpp
+++ b/engine/cl_demo.cpp
@@ -686,7 +686,7 @@ void CDemoRecorder::CloseDemoFile()
 
 		m_DemoFile.Close();
 
-		g_ClientDLL->OnDemoRecordStop();
+		if( g_ClientDLL ) g_ClientDLL->OnDemoRecordStop();
 	}
 
 	m_bCloseDemoFile = false;
diff --git a/engine/cmodel.cpp b/engine/cmodel.cpp
index 373eea3a..ca652789 100644
--- a/engine/cmodel.cpp
+++ b/engine/cmodel.cpp
@@ -50,29 +50,18 @@ csurface_t *CCollisionBSPData::GetSurfaceAtIndex( unsigned short surfaceIndex )
 	return &map_surfaces[surfaceIndex];
 }
 
-#if TEST_TRACE_POOL
-CTSPool<TraceInfo_t> g_TraceInfoPool;
-#else
 class CTraceInfoPool : public CTSList<TraceInfo_t *>
 {
 public:
 	CTraceInfoPool() = default;
 };
 
-CTraceInfoPool g_TraceInfoPool;
-#endif
+TraceInfo_t g_TraceInfo;
 
 TraceInfo_t *BeginTrace()
 {
-#if TEST_TRACE_POOL
-	TraceInfo_t *pTraceInfo = g_TraceInfoPool.GetObject();
-#else
-	TraceInfo_t *pTraceInfo;
-	if ( !g_TraceInfoPool.PopItem( &pTraceInfo ) )
-	{
-		pTraceInfo = new TraceInfo_t;
-	}
-#endif
+	TraceInfo_t * pTraceInfo = &g_TraceInfo;
+
 	if ( pTraceInfo->m_BrushCounters[0].Count() != GetCollisionBSPData()->numbrushes + 1 )
 	{
 		memset( pTraceInfo->m_Count, 0, sizeof( pTraceInfo->m_Count ) );
@@ -118,11 +107,6 @@ void EndTrace( TraceInfo_t *&pTraceInfo )
 {
 	PopTraceVisits( pTraceInfo );
 	Assert( pTraceInfo->m_nCheckDepth == -1 );
-#if TEST_TRACE_POOL
-	g_TraceInfoPool.PutObject( pTraceInfo );
-#else
-	g_TraceInfoPool.PushItem( pTraceInfo );
-#endif
 	pTraceInfo = NULL;
 }