diff --git a/trunk/dist/game/config/Custom.ini b/trunk/dist/game/config/Custom.ini
index 80ccb2ff92..a2eff118cd 100644
--- a/trunk/dist/game/config/Custom.ini
+++ b/trunk/dist/game/config/Custom.ini
@@ -325,16 +325,6 @@ OfflineDisconnectFinished = True
 StoreOfflineTradeInRealtime = True
 
 
-# ---------------------------------------------------------------------------
-# Mana Drugs/Potions
-# ---------------------------------------------------------------------------
-
-# This option will enable core support for:
-# Mana Drug (item ID 726), using skill ID 24000.
-# Mana Potion (item ID 728), using skill ID 24001.
-EnableManaPotionSupport = False
-
-
 # ---------------------------------------------------------------------------
 # Display Server Time
 # ---------------------------------------------------------------------------
diff --git a/trunk/dist/game/data/scripts/handlers/MasterHandler.java b/trunk/dist/game/data/scripts/handlers/MasterHandler.java
index fc1dcd2960..cbd3506671 100644
--- a/trunk/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/trunk/dist/game/data/scripts/handlers/MasterHandler.java
@@ -198,7 +198,6 @@ import handlers.itemhandlers.FishShots;
 import handlers.itemhandlers.Harvester;
 import handlers.itemhandlers.ItemSkills;
 import handlers.itemhandlers.ItemSkillsTemplate;
-import handlers.itemhandlers.ManaPotion;
 import handlers.itemhandlers.Maps;
 import handlers.itemhandlers.MercTicket;
 import handlers.itemhandlers.NicknameColor;
@@ -488,7 +487,6 @@ public class MasterHandler
 			Harvester.class,
 			ItemSkills.class,
 			ItemSkillsTemplate.class,
-			ManaPotion.class,
 			Maps.class,
 			MercTicket.class,
 			NicknameColor.class,
diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
deleted file mode 100644
index 7947d88a6f..0000000000
--- a/trunk/dist/game/data/scripts/handlers/itemhandlers/ManaPotion.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.itemhandlers;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.actor.L2Playable;
-import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.SystemMessageId;
-
-public class ManaPotion extends ItemSkills
-{
-	@Override
-	public boolean useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
-	{
-		if (!Config.L2JMOD_ENABLE_MANA_POTIONS_SUPPORT)
-		{
-			playable.sendPacket(SystemMessageId.NOTHING_HAPPENED);
-			return false;
-		}
-		return super.useItem(playable, item, forceUse);
-	}
-}
\ No newline at end of file
diff --git a/trunk/dist/game/data/stats/items/00700-00799.xml b/trunk/dist/game/data/stats/items/00700-00799.xml
index ded2110301..67eb41e384 100644
--- a/trunk/dist/game/data/stats/items/00700-00799.xml
+++ b/trunk/dist/game/data/stats/items/00700-00799.xml
@@ -415,7 +415,7 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="for_npc" val="true" />
-		<set name="handler" val="ManaPotion" />
+		<set name="handler" val="ItemSkills" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_stackable" val="true" />
@@ -451,7 +451,7 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="for_npc" val="true" />
-		<set name="handler" val="ManaPotion" />
+		<set name="handler" val="ItemSkills" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_stackable" val="true" />
diff --git a/trunk/java/com/l2jmobius/Config.java b/trunk/java/com/l2jmobius/Config.java
index 3ef2597549..594a9dc439 100644
--- a/trunk/java/com/l2jmobius/Config.java
+++ b/trunk/java/com/l2jmobius/Config.java
@@ -757,7 +757,6 @@ public final class Config
 	public static int OFFLINE_NAME_COLOR;
 	public static boolean OFFLINE_FAME;
 	public static boolean STORE_OFFLINE_TRADE_IN_REALTIME;
-	public static boolean L2JMOD_ENABLE_MANA_POTIONS_SUPPORT;
 	public static boolean L2JMOD_DISPLAY_SERVER_TIME;
 	public static boolean WELCOME_MESSAGE_ENABLED;
 	public static String WELCOME_MESSAGE_TEXT;
@@ -2459,8 +2458,6 @@ public final class Config
 			OFFLINE_DISCONNECT_FINISHED = CustomSettings.getBoolean("OfflineDisconnectFinished", true);
 			STORE_OFFLINE_TRADE_IN_REALTIME = CustomSettings.getBoolean("StoreOfflineTradeInRealtime", true);
 			
-			L2JMOD_ENABLE_MANA_POTIONS_SUPPORT = CustomSettings.getBoolean("EnableManaPotionSupport", false);
-			
 			L2JMOD_DISPLAY_SERVER_TIME = CustomSettings.getBoolean("DisplayServerTime", false);
 			
 			WELCOME_MESSAGE_ENABLED = CustomSettings.getBoolean("ScreenWelcomeMessageEnable", false);