diff --git a/Minecraft.Client/Minimap.cpp b/Minecraft.Client/Minimap.cpp
index b62a8a67..68780112 100644
--- a/Minecraft.Client/Minimap.cpp
+++ b/Minecraft.Client/Minimap.cpp
@@ -8,15 +8,18 @@
 #include "../Minecraft.World/net.minecraft.world.level.saveddata.h"
 #include "../Minecraft.World/net.minecraft.world.level.material.h"
 
+#ifndef MINECRAFT_SERVER_BUILD
 #ifdef __ORBIS__
 short Minimap::LUT[256];	// 4J added
 #else
 int Minimap::LUT[256];	// 4J added
 #endif
 bool Minimap::genLUT = true;		// 4J added
+#endif
 
 Minimap::Minimap(Font *font, Options *options, Textures *textures, bool optimised)
 {
+#ifndef MINECRAFT_SERVER_BUILD
 #ifdef __PS3__
 	// we're using the RSX now to upload textures to vram, so we need the main ram textures allocated from io space
 	this->pixels = intArray((int*)RenderManager.allocIOMem(w*h*sizeof(int)), 16*16);
@@ -39,7 +42,6 @@ Minimap::Minimap(Font *font, Options *options, Textures *textures, bool optimise
 	{
         pixels[i] = 0x00000000;
 	}
-
 	// 4J added - generate the colour mapping that we'll be needing as a LUT to minimise processing we actually need to do during normal rendering
 	if( genLUT )
 	{
@@ -47,10 +49,13 @@ Minimap::Minimap(Font *font, Options *options, Textures *textures, bool optimise
 	}
 	renderCount = 0;	// 4J added
 	m_optimised = optimised;
+#endif
 }
 
 void Minimap::reloadColours()
 {
+#ifndef MINECRAFT_SERVER_BUILD
+
 	ColourTable *colourTable = Minecraft::GetInstance()->getColourTable();
 	// 4J note that this code has been extracted pretty much as it was in Minimap::render, although with some byte order changes
 	for( int i = 0; i < (14 * 4); i++ )	// 14 material colours currently, 4 brightnesses of each
@@ -95,11 +100,13 @@ void Minimap::reloadColours()
 
 	}
 	genLUT = false;
+#endif
 }
 
 // 4J added entityId
 void Minimap::render(shared_ptr<Player> player, Textures *textures, shared_ptr<MapItemSavedData> data, int entityId)
 {
+#ifndef MINECRAFT_SERVER_BUILD
 	// 4J - only update every 8 renders, as an optimisation
 	// We don't want to use this for ItemFrame renders of maps, as then we can't have different maps together
 	if( !m_optimised || ( renderCount & 7 ) == 0 )
@@ -252,5 +259,6 @@ void Minimap::render(shared_ptr<Player> player, Textures *textures, shared_ptr<M
 	}
 //#endif
     glPopMatrix();
+#endif
 
 }
diff --git a/Minecraft.Client/Minimap.h b/Minecraft.Client/Minimap.h
index 84e439e6..201061f5 100644
--- a/Minecraft.Client/Minimap.h
+++ b/Minecraft.Client/Minimap.h
@@ -11,6 +11,8 @@ class Minimap
 private:
 	static const int w = MapItem::IMAGE_WIDTH;
     static const int h = MapItem::IMAGE_HEIGHT;
+#ifndef MINECRAFT_SERVER_BUILD
+
 #ifdef __ORBIS__
 	static short LUT[256];	// 4J added
 #else
@@ -19,6 +21,7 @@ private:
 	static bool genLUT;		// 4J added
 	int renderCount;		// 4J added
 	bool m_optimised;		// 4J Added
+
 #ifdef __ORBIS__
 	shortArray pixels;
 #else
@@ -27,6 +30,7 @@ private:
     int mapTexture;
     Options *options;
     Font *font;
+#endif
 
 public:
 	Minimap(Font *font, Options *options, Textures *textures, bool optimised = true); // 4J Added optimised param
diff --git a/Minecraft.Server/Windows64/ServerMain.cpp b/Minecraft.Server/Windows64/ServerMain.cpp
index b5d5402c..b423a90c 100644
--- a/Minecraft.Server/Windows64/ServerMain.cpp
+++ b/Minecraft.Server/Windows64/ServerMain.cpp
@@ -488,39 +488,11 @@ int main(int argc, char **argv)
 		config.worldHellScale);
 #endif
 
-	LogStartupStep("registering hidden window class");
-	HINSTANCE hInstance = GetModuleHandle(NULL);
-	MyRegisterClass(hInstance);
-
-	LogStartupStep("creating hidden window");
-	if (!InitInstance(hInstance, SW_HIDE))
-	{
-		LogError("startup", "Failed to create window instance.");
-		
-		return 2;
-	}
-	ShowWindow(g_hWnd, SW_HIDE);
-
-	LogStartupStep("initializing graphics device wrappers");
-	if (FAILED(InitDevice()))
-	{
-		LogError("startup", "Failed to initialize D3D device.");
-		CleanupDevice();
-		
-		return 2;
-	}
-
 	LogStartupStep("loading media/string tables");
 	app.loadMediaArchive();
-	RenderManager.Initialise(g_pd3dDevice, g_pSwapChain);
 	app.loadStringTable();
-	ui.init(g_pd3dDevice, g_pImmediateContext, g_pRenderTargetView, g_pDepthStencilView, g_iScreenWidth, g_iScreenHeight);
 
 	InputManager.Initialise(1, 3, MINECRAFT_ACTION_MAX, ACTION_MAX_MENU);
-	g_KBMInput.Init();
-	DefineActions();
-	InputManager.SetJoypadMapVal(0, 0);
-	InputManager.SetKeyRepeatRate(0.3f, 0.2f);
 
 	ProfileManager.Initialise(
 		TITLEID_MINECRAFT,