diff --git a/src/servers/app/server/FontServer.cpp b/src/servers/app/server/FontServer.cpp
index b2ee1336e6..338eef95dd 100644
--- a/src/servers/app/server/FontServer.cpp
+++ b/src/servers/app/server/FontServer.cpp
@@ -441,7 +441,6 @@ FontStyle *FontServer::GetStyle(const char *family, const char *style)
 */
 FontStyle *FontServer::GetStyle(const uint16 &familyid, const uint16 &styleid)
 {
-	// TODO: Implement FontServer::GetStyle(id,id)
 	FontFamily *fam=GetFamily(familyid);
 	if(fam)
 	{
@@ -470,12 +469,7 @@ FontFamily *FontServer::GetFamily(const uint16 &familyid) const
 */
 ServerFont *FontServer::GetSystemPlain(void)
 {
-	if(plain)
-	{
-		ServerFont *f=new ServerFont(*plain);
-		return f;
-	}
-	return NULL;
+	return plain;
 }
 
 /*!
@@ -486,12 +480,7 @@ ServerFont *FontServer::GetSystemPlain(void)
 */
 ServerFont *FontServer::GetSystemBold(void)
 {
-	if(bold)
-	{
-		ServerFont *f=new ServerFont(*bold);
-		return f;
-	}
-	return NULL;
+	return bold;
 }
 
 /*!
@@ -502,12 +491,7 @@ ServerFont *FontServer::GetSystemBold(void)
 */
 ServerFont *FontServer::GetSystemFixed(void)
 {
-	if(fixed)
-	{
-		ServerFont *f=new ServerFont(*fixed);
-		return f;
-	}
-	return NULL;
+	return fixed;
 }
 
 /*!
diff --git a/src/servers/app/server/ServerApp.cpp b/src/servers/app/server/ServerApp.cpp
index 6356c153cc..c3f0677370 100644
--- a/src/servers/app/server/ServerApp.cpp
+++ b/src/servers/app/server/ServerApp.cpp
@@ -1430,7 +1430,6 @@ void ServerApp::DispatchMessage(int32 code, LinkMsgReader &msg)
 			
 			fontserver->Unlock();
 			
-			delete sf;
 			break;
 		}
 		case AS_GET_FONT_HEIGHT:
@@ -1506,7 +1505,6 @@ void ServerApp::DispatchMessage(int32 code, LinkMsgReader &msg)
 			
 			fontserver->Unlock();
 			
-			delete sf;
 			break;
 		}
 		case AS_SET_SYSFONT_FIXED:
@@ -1546,7 +1544,6 @@ void ServerApp::DispatchMessage(int32 code, LinkMsgReader &msg)
 			
 			fontserver->Unlock();
 			
-			delete sf;
 			break;
 		}
 		default: