diff --git a/application/Conversation.cpp b/application/Conversation.cpp
index 875abf3..9ca3f13 100644
--- a/application/Conversation.cpp
+++ b/application/Conversation.cpp
@@ -20,7 +20,6 @@
 #include "ProtocolManager.h"
 #include "Server.h"
 #include "TheApp.h"
-#include "WindowsManager.h"
 
 
 Conversation::Conversation(BString id, BMessenger msgn)
diff --git a/application/Makefile b/application/Makefile
index ccd2033..370f98e 100644
--- a/application/Makefile
+++ b/application/Makefile
@@ -51,7 +51,6 @@ SRCS = \
 	application/Server.cpp \
 	application/TheApp.cpp \
 	application/User.cpp \
-	application/WindowsManager.cpp \
 	application/preferences/AccountDialog.cpp \
 	application/preferences/AccountListItem.cpp \
 	application/preferences/AccountView.cpp \
diff --git a/application/WindowsManager.cpp b/application/WindowsManager.cpp
deleted file mode 100644
index aad06e4..0000000
--- a/application/WindowsManager.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2009-2011, Andrea Anzani. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *		Andrea Anzani, andrea.anzani@gmail.com
- */
-
-#include "WindowsManager.h"
-
-WindowsManager*	WindowsManager::fInstance = NULL;
-
-
-WindowsManager::WindowsManager()
-{
-	fCurrentPoint.Set(20.0f, 20.0f);
-}
-
-
-WindowsManager*
-WindowsManager::Get()
-{
-	if (!fInstance)
-		fInstance = new WindowsManager();
-
-	return fInstance;	
-}
-
-
-void	
-WindowsManager::RelocateWindow(BWindow*	window)
-{
-	window->SetWorkspaces(B_CURRENT_WORKSPACE);
-	window->MoveTo(fCurrentPoint);
-	fCurrentPoint += BPoint(20.0f, 20.0f);
-}
diff --git a/application/WindowsManager.h b/application/WindowsManager.h
deleted file mode 100644
index e76c7d8..0000000
--- a/application/WindowsManager.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2009-2011, Andrea Anzani. All rights reserved.
- * Distributed under the terms of the MIT License.
- */
-#ifndef _WINDOWS_MANAGER_H_
-#define _WINDOWS_MANAGER_H_
-
-#include <Window.h>
-#include <Point.h>
-
-class WindowsManager
-{
-public:
-	static	WindowsManager*	Get();
-		
-	void					RelocateWindow(BWindow*	window);
-
-private:
-							WindowsManager();
-
-	static	WindowsManager*	fInstance;
-			BPoint			fCurrentPoint;
-};
-
-#endif	// _WINDOWS_MANAGER_H_