diff --git a/src/kits/app/AppServerLink.cpp b/src/kits/app/AppServerLink.cpp
index 7441267fbe..2d6a837dde 100644
--- a/src/kits/app/AppServerLink.cpp
+++ b/src/kits/app/AppServerLink.cpp
@@ -31,7 +31,6 @@
 
 // System Includes -------------------------------------------------------------
 #include <Application.h>
-#include <PortLink.h>
 
 // Project Includes ------------------------------------------------------------
 #include <AppServerLink.h>
@@ -44,23 +43,19 @@
 
 namespace BPrivate {
 
-//------------------------------------------------------------------------------
-BAppServerLink::BAppServerLink()
+BAppServerLink::BAppServerLink(void)
+ : PortLink(0L)
 {
 	be_app->Lock();
-	portlink=new PortLink(be_app->fServerFrom);
+	SetPort(be_app->fServerFrom);
 }
+
 //------------------------------------------------------------------------------
+
 BAppServerLink::~BAppServerLink()
 {
-	delete portlink;
 	be_app->Unlock();
 }
-//------------------------------------------------------------------------------
-void BAppServerLink::Init()
-{
-}
-//------------------------------------------------------------------------------
 
 }	// namespace BPrivate
 
diff --git a/src/kits/app/Cursor.cpp b/src/kits/app/Cursor.cpp
index 740f9d4928..6e8fbe3bc5 100644
--- a/src/kits/app/Cursor.cpp
+++ b/src/kits/app/Cursor.cpp
@@ -66,12 +66,11 @@ BCursor::BCursor(const void *cursorData)
 
   // Send data directly to server
   BPrivate::BAppServerLink *serverlink = new BPrivate::BAppServerLink;
-  serverlink->Init();
-  serverlink->portlink->SetOpCode(AS_SET_CURSOR_BCURSOR);
-  serverlink->portlink->Attach((void *)cursorData,68);
+  serverlink->SetOpCode(AS_SET_CURSOR_BCURSOR);
+  serverlink->Attach((void *)cursorData,68);
 
   //Rumor has it that this API will be cleaned up later
-  buffer=serverlink->portlink->FlushWithReply(&returncode,&status,&buffersize);
+  buffer=serverlink->FlushWithReply(&returncode,&status,&buffersize);
   m_serverToken=*((int32*)buffer);
 
   delete serverlink;