diff --git a/gnoemoe/gm-world.h b/gnoemoe/gm-world.h
index 5c0b0e7..c1d59a4 100644
--- a/gnoemoe/gm-world.h
+++ b/gnoemoe/gm-world.h
@@ -6,6 +6,7 @@
 #include "gm-net.h"
 #include "gm-editor.h"
 #include "gm-triggers.h"
+#include "mcp/gm-mcp-session.h"
 
 G_BEGIN_DECLS
 
@@ -20,17 +21,6 @@ G_BEGIN_DECLS
 #define GM_IS_WORLD_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), GM_TYPE_WORLD))
 #define GM_WORLD_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS((obj), GM_TYPE_WORLD, GmWorldClass))
 
-typedef struct _GmWorldInfo {
-	gchar *homepage;
-	gchar *location;
-	gchar *admin;
-	gchar *contact;
-	gchar *charset;
-	gchar *language;
-	gchar *system;
-	gchar *logo;
-} GmWorldInfo;
-
 /** \ingroup world
  *  \brief struct for world editing information
  *
@@ -93,7 +83,6 @@ struct _GmWorldClass {
 	void (* name_changed) (GmWorld *world, gchar const *name);
 	void (* active_changed) (GmWorld *world, gboolean active);
 	void (* activity_changed) (GmWorld *world, gint activity);
-	void (* status_changed) (GmWorld *world, gchar const *status);
 };
 
 GType gm_world_get_type(void) G_GNUC_CONST;
@@ -105,7 +94,6 @@ void gm_world_unload(GmWorld *world);
 
 const gchar *gm_world_name(GmWorld *world);
 GmOptions *gm_world_options(GmWorld *world);
-GmWorldInfo gm_world_info(GmWorld *world);
 const gchar *gm_world_path(GmWorld *world);
 GList **gm_world_history(GmWorld *world);
 gint gm_world_activity(GmWorld *world);
@@ -118,8 +106,8 @@ const gchar *gm_world_current_port(GmWorld *world);
 void gm_world_set_name(GmWorld *world, const gchar *name);
 void gm_world_set_activity(GmWorld *world, gint activity);
 void gm_world_set_active(GmWorld *world, gboolean active);
-void gm_world_set_status(GmWorld *world, gchar const *status);
-gchar const *gm_world_get_status(GmWorld *world);
+
+GmMcpSession *gm_world_get_mcp_session(GmWorld *world);
 
 gboolean gm_world_loaded(GmWorld *world);
 GmNetState gm_world_state(GmWorld *world);