diff --git a/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
index 242586e2e2..3bf4adf8ae 100644
--- a/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
+++ b/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
@@ -45,9 +45,9 @@ import quests.Q10302_UnsettlingShadowAndRumors.Q10302_UnsettlingShadowAndRumors;
  */
 public class Q10304_ForForgottenHeroes extends Quest
 {
-	// Npc
+	// NPC
 	private static final int ISHAEL = 32894;
-	// mobs
+	// Monsters
 	private static final int YUI = 25837;
 	private static final int KINEN = 25840;
 	private static final int KONYAR = 25845;
@@ -56,7 +56,7 @@ public class Q10304_ForForgottenHeroes extends Quest
 	private static final int HORNAFI = 25839;
 	private static final int YONTYMAK = 25846;
 	private static final int RON = 25825;
-	// items;
+	// Items
 	private static final int EWR = 17526; // Scroll: Enchant Weapon (R-grade)
 	private static final int EAR = 17527; // Scroll: Enchant Armor (R-grade)
 	private static final int COKES = 36563; // Synthetic Cokes
@@ -98,16 +98,6 @@ public class Q10304_ForForgottenHeroes extends Quest
 				htmltext = event;
 				break;
 			}
-			case "cond8":
-			{
-				qs.setCond(8);
-				break;
-			}
-			case "cond9":
-			{
-				qs.setCond(9);
-				break;
-			}
 			case "reward1":
 			{
 				giveItems(player, COKES, 68);
@@ -232,11 +222,11 @@ public class Q10304_ForForgottenHeroes extends Quest
 			}
 			else if ((npcId == YONTYMAK) && (cond == 7))
 			{
-				startQuestTimer("cond8", 300, null, player);
+				qs.setCond(8);
 			}
 			else if ((npcId == RON) && (cond == 8))
 			{
-				startQuestTimer("cond9", 300, null, player);
+				qs.setCond(8);
 			}
 		}
 		final ExQuestNpcLogList log = new ExQuestNpcLogList(getId());
diff --git a/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
index 2a64b35cae..5b58d268ff 100644
--- a/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
+++ b/L2J_Mobius_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
@@ -190,12 +190,6 @@ public final class Q10753_WindsOfFateChoices extends Quest
 				qs.setCond(2, true);
 				break;
 			}
-			case "cond4":
-			{
-				qs.setCond(4, true);
-				htmltext = "30174-05.html";
-				break;
-			}
 			case "31149-03.html":
 			{
 				giveItems(player, RESTORATION_REGEANT, 1);
@@ -444,7 +438,8 @@ public final class Q10753_WindsOfFateChoices extends Quest
 						{
 							giveItems(player, CRUDE_PHILOPERS_STONE, 1);
 							giveItems(player, EMPTY_REGEANT_FLASK, 1);
-							startQuestTimer("cond4", 100, null, player);
+							qs.setCond(4, true);
+							htmltext = "30174-05.html";
 						}
 						else if (qs.isCond(4))
 						{
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
index 229fa3a520..6618063fa1 100644
--- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
@@ -45,9 +45,9 @@ import quests.Q10302_UnsettlingShadowAndRumors.Q10302_UnsettlingShadowAndRumors;
  */
 public class Q10304_ForForgottenHeroes extends Quest
 {
-	// Npc
+	// NPC
 	private static final int ISHAEL = 32894;
-	// mobs
+	// Monsters
 	private static final int YUI = 25837;
 	private static final int KINEN = 25840;
 	private static final int KONYAR = 25845;
@@ -56,7 +56,7 @@ public class Q10304_ForForgottenHeroes extends Quest
 	private static final int HORNAFI = 25839;
 	private static final int YONTYMAK = 25846;
 	private static final int RON = 25825;
-	// items;
+	// Items
 	private static final int EWR = 17526; // Scroll: Enchant Weapon (R-grade)
 	private static final int EAR = 17527; // Scroll: Enchant Armor (R-grade)
 	private static final int COKES = 36563; // Synthetic Cokes
@@ -98,16 +98,6 @@ public class Q10304_ForForgottenHeroes extends Quest
 				htmltext = event;
 				break;
 			}
-			case "cond8":
-			{
-				qs.setCond(8);
-				break;
-			}
-			case "cond9":
-			{
-				qs.setCond(9);
-				break;
-			}
 			case "reward1":
 			{
 				giveItems(player, COKES, 68);
@@ -232,11 +222,11 @@ public class Q10304_ForForgottenHeroes extends Quest
 			}
 			else if ((npcId == YONTYMAK) && (cond == 7))
 			{
-				startQuestTimer("cond8", 300, null, player);
+				qs.setCond(8);
 			}
 			else if ((npcId == RON) && (cond == 8))
 			{
-				startQuestTimer("cond9", 300, null, player);
+				qs.setCond(8);
 			}
 		}
 		final ExQuestNpcLogList log = new ExQuestNpcLogList(getId());
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
index e14b747b74..cc86a24030 100644
--- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
@@ -190,12 +190,6 @@ public final class Q10753_WindsOfFateChoices extends Quest
 				qs.setCond(2, true);
 				break;
 			}
-			case "cond4":
-			{
-				qs.setCond(4, true);
-				htmltext = "30174-05.html";
-				break;
-			}
 			case "31149-03.html":
 			{
 				giveItems(player, RESTORATION_REGEANT, 1);
@@ -444,7 +438,8 @@ public final class Q10753_WindsOfFateChoices extends Quest
 						{
 							giveItems(player, CRUDE_PHILOPERS_STONE, 1);
 							giveItems(player, EMPTY_REGEANT_FLASK, 1);
-							startQuestTimer("cond4", 100, null, player);
+							qs.setCond(4, true);
+							htmltext = "30174-05.html";
 						}
 						else if (qs.isCond(4))
 						{
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
index 242586e2e2..3bf4adf8ae 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java
@@ -45,9 +45,9 @@ import quests.Q10302_UnsettlingShadowAndRumors.Q10302_UnsettlingShadowAndRumors;
  */
 public class Q10304_ForForgottenHeroes extends Quest
 {
-	// Npc
+	// NPC
 	private static final int ISHAEL = 32894;
-	// mobs
+	// Monsters
 	private static final int YUI = 25837;
 	private static final int KINEN = 25840;
 	private static final int KONYAR = 25845;
@@ -56,7 +56,7 @@ public class Q10304_ForForgottenHeroes extends Quest
 	private static final int HORNAFI = 25839;
 	private static final int YONTYMAK = 25846;
 	private static final int RON = 25825;
-	// items;
+	// Items
 	private static final int EWR = 17526; // Scroll: Enchant Weapon (R-grade)
 	private static final int EAR = 17527; // Scroll: Enchant Armor (R-grade)
 	private static final int COKES = 36563; // Synthetic Cokes
@@ -98,16 +98,6 @@ public class Q10304_ForForgottenHeroes extends Quest
 				htmltext = event;
 				break;
 			}
-			case "cond8":
-			{
-				qs.setCond(8);
-				break;
-			}
-			case "cond9":
-			{
-				qs.setCond(9);
-				break;
-			}
 			case "reward1":
 			{
 				giveItems(player, COKES, 68);
@@ -232,11 +222,11 @@ public class Q10304_ForForgottenHeroes extends Quest
 			}
 			else if ((npcId == YONTYMAK) && (cond == 7))
 			{
-				startQuestTimer("cond8", 300, null, player);
+				qs.setCond(8);
 			}
 			else if ((npcId == RON) && (cond == 8))
 			{
-				startQuestTimer("cond9", 300, null, player);
+				qs.setCond(8);
 			}
 		}
 		final ExQuestNpcLogList log = new ExQuestNpcLogList(getId());
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
index 2a64b35cae..5b58d268ff 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java
@@ -190,12 +190,6 @@ public final class Q10753_WindsOfFateChoices extends Quest
 				qs.setCond(2, true);
 				break;
 			}
-			case "cond4":
-			{
-				qs.setCond(4, true);
-				htmltext = "30174-05.html";
-				break;
-			}
 			case "31149-03.html":
 			{
 				giveItems(player, RESTORATION_REGEANT, 1);
@@ -444,7 +438,8 @@ public final class Q10753_WindsOfFateChoices extends Quest
 						{
 							giveItems(player, CRUDE_PHILOPERS_STONE, 1);
 							giveItems(player, EMPTY_REGEANT_FLASK, 1);
-							startQuestTimer("cond4", 100, null, player);
+							qs.setCond(4, true);
+							htmltext = "30174-05.html";
 						}
 						else if (qs.isCond(4))
 						{