--- a/userlibandfileserver/fileserver/sfile/sf_main.cpp	Wed Sep 22 10:53:45 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_main.cpp	Mon Sep 27 10:52:00 2010 +0100
@@ -78,8 +78,7 @@
 	TInt fn = Message().Function();
 
 	// CServer2::DoConnectL() manipulates iSessionQ & so does CSession2::~CSession2().
-	// Unfortunately the session is deleted from a seperate thread (the disconnect 
-	// thread) so we need a lock to protect it.
+	// Unfortunately the session may be deleted from a drive thread so we need a lock to protect it.
 	if (fn == RMessage2::EConnect)
 		{
 		SessionQueueLockWait();		// lock
@@ -459,8 +458,6 @@
 	DisabledCapabilities=*(SCapabilitySet*)∩︀
 
 	FsThreadManager::SetMainThreadId();
-	r=FsThreadManager::CreateDisconnectThread();
-	__ASSERT_ALWAYS(r==KErrNone,Fault(EMainDisconnectThread));
 
 
 	//