diff --git a/TShockAPI/DB/InventoryManager.cs b/TShockAPI/DB/InventoryManager.cs
index dd8ce24a..a7d45e66 100644
--- a/TShockAPI/DB/InventoryManager.cs
+++ b/TShockAPI/DB/InventoryManager.cs
@@ -54,7 +54,6 @@ namespace TShockAPI.DB
                     {
                         playerData.exists = true;
                         playerData.maxHealth = reader.Get<int>("MaxHealth");
-                        playerData.maxMana = reader.Get<int>("MaxMana");
                         playerData.inventory = NetItem.Parse(reader.Get<string>("Inventory"));
                         return playerData;
                     }
@@ -79,7 +78,7 @@ namespace TShockAPI.DB
             {
                 try
                 {
-                    database.Query("INSERT INTO Inventory (Account, MaxHealth, MaxMana, Inventory) VALUES (@0, @1, @2, @3);", player.UserID, playerData.maxHealth, playerData.maxMana, NetItem.ToString(playerData.inventory));
+                    database.Query("INSERT INTO Inventory (Account, MaxHealth, Inventory) VALUES (@0, @1, @2);", player.UserID, playerData.maxHealth, NetItem.ToString(playerData.inventory));
                     return true;
                 }
                 catch (Exception ex)
@@ -91,7 +90,7 @@ namespace TShockAPI.DB
             {
                 try
                 {
-                    database.Query("UPDATE Inventory SET MaxHealth = @0, MaxMana = @1, Inventory = @2 WHERE Account = @3;", playerData.maxHealth, playerData.maxMana, NetItem.ToString(playerData.inventory), player.UserID);
+                    database.Query("UPDATE Inventory SET MaxHealth = @0, Inventory = @1 WHERE Account = @2;", playerData.maxHealth, NetItem.ToString(playerData.inventory), player.UserID);
                     return true;
                 }
                 catch (Exception ex)
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index f63a69de..0bd6494a 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -180,11 +180,6 @@ namespace TShockAPI
                 args.Player.IgnoreActionsForCheating = true;
             }
 
-            if (args.Player.IsLoggedIn)
-            {
-                args.Player.PlayerData.maxMana = max;
-            }
-
             return false;
         }
 
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index d9306c33..d38c13fd 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -440,7 +440,7 @@ namespace TShockAPI
     {
         public NetItem[] inventory = new NetItem[NetItem.maxNetInventory];
         public int maxHealth = 100;
-        public int maxMana = 100;
+        //public int maxMana = 100;
         public bool exists = false;
 
         public PlayerData(TSPlayer player)
@@ -481,7 +481,6 @@ namespace TShockAPI
         public void CopyInventory(TSPlayer player)
         {
             this.maxHealth = player.TPlayer.statLifeMax;
-            this.maxMana = player.TPlayer.statManaMax;
             Item[] inventory = player.TPlayer.inventory;
             Item[] armor = player.TPlayer.armor;
             for (int i = 0; i < NetItem.maxNetInventory; i++)
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index b007be87..3ef90576 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -1050,12 +1050,6 @@ namespace TShockAPI
                 check = false;
             }
 
-            if (player.TPlayer.statManaMax > playerData.maxMana)
-            {
-                player.SendMessage("Error: Your max mana exceeded (" + playerData.maxMana + ") which is stored on server", Color.Cyan);
-                check = false;
-            }
-
             Item[] inventory = player.TPlayer.inventory;
             Item[] armor = player.TPlayer.armor;
             for (int i = 0; i < NetItem.maxNetInventory; i++)