diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index d15528c6..56d46df2 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -130,8 +130,6 @@ namespace TShockAPI
             ChatCommands.Add(new Command("save", "cfg", Save));
             ChatCommands.Add(new Command("maxspawns", "cfg", MaxSpawns));
             ChatCommands.Add(new Command("spawnrate", "cfg", SpawnRate));
-            ChatCommands.Add(new Command("setspawn", "cfg", SetSpawn));
-            ChatCommands.Add(new Command("savespawn", "cfg", SaveSpawn));
             ChatCommands.Add(new Command("time", "time", Time));
             ChatCommands.Add(new Command("slap", "pvpfun", Slap));
             ChatCommands.Add(new Command("antibuild", "editspawn", ToggleAntiBuild));
@@ -871,23 +869,6 @@ namespace TShockAPI
 
         #region Server Config Commands
 
-        private static void SetSpawn(CommandArgs args)
-        {
-            ConfigurationManager.SpawnTileX = args.Player.TileX;
-            ConfigurationManager.SpawnTileY = args.Player.TileY + 3;
-            ConfigurationManager.Spawn_WorldID = Main.worldID;
-            ConfigurationManager.WriteJsonConfiguration();
-            args.Player.SendMessage("Set server spawn point to your position");
-        }
-
-        private static void SaveSpawn(CommandArgs args)
-        {
-            Main.spawnTileX = ConfigurationManager.SpawnTileX;
-            Main.spawnTileY = ConfigurationManager.SpawnTileY;
-            WorldGen.saveWorld();
-            args.Player.SendMessage("Saved current spawn point to file.");
-        }
-
         private static void DebugConfiguration(CommandArgs args)
         {
             args.Player.SendMessage("TShock Config:");
diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs
index a1b2818c..eff333b1 100644
--- a/TShockAPI/ConfigFile.cs
+++ b/TShockAPI/ConfigFile.cs
@@ -52,12 +52,6 @@ namespace TShockAPI
         public int BackupInterval = 0;
         public int BackupKeepFor = 60;
 
-        public bool ListServer = false;
-
-        public int SpawnTileX;
-        public int SpawnTileY;
-        public int Spawn_WorldID;
-
         public bool RememberLeavePos = false;
 
         public bool HardcoreOnly = false;
diff --git a/TShockAPI/ConfigurationManager.cs b/TShockAPI/ConfigurationManager.cs
index 161593ad..fa89dc4b 100644
--- a/TShockAPI/ConfigurationManager.cs
+++ b/TShockAPI/ConfigurationManager.cs
@@ -72,17 +72,6 @@ namespace TShockAPI
         /// </summary>
         public static int BackupKeepFor = 60;
 
-        /// <summary>
-        /// Server will broadcast itself to the server list.
-        /// </summary>
-        public static bool ListServer = false;
-
-        public static int Spawn_WorldID;
-        public static int OriginalSpawnX;
-        public static int OriginalSpawnY;
-        public static int SpawnTileX;
-        public static int SpawnTileY;
-
         public static bool HardcoreOnly = false;
         public static bool KickOnHardcoreDeath = false;
         public static bool BanOnHardcoreDeath = false;
@@ -126,12 +115,6 @@ namespace TShockAPI
             PvpThrottle = cfg.PvpThrottle;
             BackupInterval = cfg.BackupInterval;
             BackupKeepFor = cfg.BackupKeepFor;
-            ListServer = cfg.ListServer;
-            OriginalSpawnX = Main.spawnTileX;
-            OriginalSpawnY = Main.spawnTileY;
-            SpawnTileX = cfg.SpawnTileX;
-            SpawnTileY = cfg.SpawnTileY;
-            Spawn_WorldID = cfg.Spawn_WorldID;
             RememberLeavePos = cfg.RememberLeavePos;
             HardcoreOnly = cfg.HardcoreOnly;
             KickOnHardcoreDeath = cfg.KickOnHardcoreOnlyDeath;
@@ -170,11 +153,7 @@ namespace TShockAPI
             cfg.PvpThrottle = PvpThrottle;
             cfg.BackupInterval = BackupInterval;
             cfg.BackupKeepFor = BackupKeepFor;
-            cfg.ListServer = ListServer;
-            cfg.SpawnTileX = SpawnTileX;
-            cfg.SpawnTileY = SpawnTileY;
             cfg.RememberLeavePos = RememberLeavePos;
-            cfg.Spawn_WorldID = Spawn_WorldID;
             cfg.HardcoreOnly = HardcoreOnly;
             cfg.BanOnHardcoreOnlyDeath = BanOnHardcoreDeath;
             cfg.KickOnHardcoreOnlyDeath = KickOnHardcoreDeath;
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index d231afad..560b4b84 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -231,15 +231,6 @@ namespace TShockAPI
                     }
                 }
             }
-            var id = Main.worldID;
-            if (ConfigurationManager.Spawn_WorldID != Main.worldID)
-            {
-                Main.spawnTileX = ConfigurationManager.OriginalSpawnX;
-                Main.spawnTileY = ConfigurationManager.OriginalSpawnY;
-                ConfigurationManager.SpawnTileX = Main.spawnTileX;
-                ConfigurationManager.SpawnTileY = Main.spawnTileY;
-                ConfigurationManager.Spawn_WorldID = Main.worldID;
-            }
         }
 
         private void OnJoin(int ply, HandledEventArgs handler)