diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/gs_optimize.sql b/L2J_DataPack_BETA/dist/sql/game/updates/gs_optimize.sql
index 8cee6d337c1c2e1cd974ca9ce0d58617f5a4cc06..7a5a73a069eb776cee4fa46ab0804bf84f93dd62 100644
--- a/L2J_DataPack_BETA/dist/sql/game/updates/gs_optimize.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/gs_optimize.sql
@@ -4,16 +4,15 @@ OPTIMIZE TABLE auction;
 OPTIMIZE TABLE auction_bid;
 OPTIMIZE TABLE auction_watch;
 OPTIMIZE TABLE auto_announcements;
-OPTIMIZE TABLE auto_chat_text;
-OPTIMIZE TABLE auto_chat;
+-- OPTIMIZE TABLE auto_chat_text;
+-- OPTIMIZE TABLE auto_chat;
 OPTIMIZE TABLE castle;
-OPTIMIZE TABLE castle_door;
 OPTIMIZE TABLE castle_doorupgrade;
 OPTIMIZE TABLE castle_functions;
 OPTIMIZE TABLE castle_manor_procure;
 OPTIMIZE TABLE castle_manor_production;
-OPTIMIZE TABLE castle_siege_guards;
-OPTIMIZE TABLE char_templates;
+-- OPTIMIZE TABLE castle_siege_guards;
+-- OPTIMIZE TABLE char_templates;
 OPTIMIZE TABLE character_contacts;
 OPTIMIZE TABLE character_friends;
 OPTIMIZE TABLE character_hennas;
@@ -49,27 +48,26 @@ OPTIMIZE TABLE clan_wars;
 OPTIMIZE TABLE clanhall;
 OPTIMIZE TABLE clanhall_functions;
 OPTIMIZE TABLE clanhall_siege_attackers;
-OPTIMIZE TABLE clanhall_siege_guards;
+-- OPTIMIZE TABLE clanhall_siege_guards;
 OPTIMIZE TABLE cursed_weapons;
-OPTIMIZE TABLE dimensional_rift;
-OPTIMIZE TABLE droplist;
+-- OPTIMIZE TABLE dimensional_rift;
+-- OPTIMIZE TABLE droplist;
 OPTIMIZE TABLE fort;
 OPTIMIZE TABLE fort_doorupgrade;
 OPTIMIZE TABLE fort_functions;
-OPTIMIZE TABLE fort_siege_guards;
-OPTIMIZE TABLE fort_spawnlist;
-OPTIMIZE TABLE fort_staticobjects;
+-- OPTIMIZE TABLE fort_siege_guards;
+-- OPTIMIZE TABLE fort_spawnlist;
 OPTIMIZE TABLE fortsiege_clans;
 OPTIMIZE TABLE forums;
-OPTIMIZE TABLE four_sepulchers_spawnlist;
+-- OPTIMIZE TABLE four_sepulchers_spawnlist;
 OPTIMIZE TABLE games;
 OPTIMIZE TABLE global_tasks;
 OPTIMIZE TABLE global_variables;
 OPTIMIZE TABLE grandboss_data;
 OPTIMIZE TABLE grandboss_list;
-OPTIMIZE TABLE hellbound_spawnlist;
-OPTIMIZE TABLE helper_buff_list;
-OPTIMIZE TABLE herb_droplist_groups;
+-- OPTIMIZE TABLE hellbound_spawnlist;
+-- OPTIMIZE TABLE helper_buff_list;
+-- OPTIMIZE TABLE herb_droplist_groups;
 OPTIMIZE TABLE heroes;
 OPTIMIZE TABLE heroes_diary;
 OPTIMIZE TABLE item_attributes;
@@ -78,32 +76,32 @@ OPTIMIZE TABLE item_auction;
 OPTIMIZE TABLE item_elementals;
 OPTIMIZE TABLE items;
 OPTIMIZE TABLE itemsonground;
-OPTIMIZE TABLE locations;
-OPTIMIZE TABLE lvlupgain;
-OPTIMIZE TABLE merchant_buylists;
+-- OPTIMIZE TABLE locations;
+-- OPTIMIZE TABLE lvlupgain;
+-- OPTIMIZE TABLE merchant_buylists;
 OPTIMIZE TABLE merchant_lease;
-OPTIMIZE TABLE merchant_shopids;
+-- OPTIMIZE TABLE merchant_shopids;
 OPTIMIZE TABLE messages;
-OPTIMIZE TABLE minions;
+-- OPTIMIZE TABLE minions;
 OPTIMIZE TABLE mods_wedding;
-OPTIMIZE TABLE npc;
-OPTIMIZE TABLE npc_buffer;
-OPTIMIZE TABLE npcaidata;
-OPTIMIZE TABLE npc_elementals;
-OPTIMIZE TABLE npcskills;
+-- OPTIMIZE TABLE npc;
+-- OPTIMIZE TABLE npc_buffer;
+-- OPTIMIZE TABLE npcaidata;
+-- OPTIMIZE TABLE npc_elementals;
+-- OPTIMIZE TABLE npcskills;
 OPTIMIZE TABLE olympiad_data;
 OPTIMIZE TABLE olympiad_fights;
 OPTIMIZE TABLE olympiad_nobles;
 OPTIMIZE TABLE olympiad_nobles_eom;
 OPTIMIZE TABLE petition_feedback;
 OPTIMIZE TABLE pets;
-OPTIMIZE TABLE pets_skills;
+-- OPTIMIZE TABLE pets_skills;
 OPTIMIZE TABLE posts;
 OPTIMIZE TABLE quest_global_data;
 OPTIMIZE TABLE raidboss_spawnlist;
 OPTIMIZE TABLE rainbowsprings_attacker_list;
-OPTIMIZE TABLE random_spawn;
-OPTIMIZE TABLE random_spawn_loc;
+-- OPTIMIZE TABLE random_spawn;
+-- OPTIMIZE TABLE random_spawn_loc;
 OPTIMIZE TABLE seven_signs;
 OPTIMIZE TABLE seven_signs_festival;
 OPTIMIZE TABLE seven_signs_status;
@@ -111,10 +109,10 @@ OPTIMIZE TABLE siegable_clanhall;
 OPTIMIZE TABLE siegable_hall_flagwar_attackers;
 OPTIMIZE TABLE siegable_hall_flagwar_attackers_members;
 OPTIMIZE TABLE siege_clans;
-OPTIMIZE TABLE skill_learn;
-OPTIMIZE TABLE spawnlist;
-OPTIMIZE TABLE teleport;
+-- OPTIMIZE TABLE skill_learn;
+-- OPTIMIZE TABLE spawnlist;
+-- OPTIMIZE TABLE teleport;
 OPTIMIZE TABLE territories;
 OPTIMIZE TABLE territory_registrations;
-OPTIMIZE TABLE territory_spawnlist;
+-- OPTIMIZE TABLE territory_spawnlist;
 OPTIMIZE TABLE topic;
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql b/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql
index 033cee624690a82cf04288faf12a05501684f002..760dc224d2749f57dfb5bf6a1cdd6691ba967d22 100644
--- a/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql
+++ b/L2J_DataPack_BETA/dist/tools/gs_cleanup.sql
@@ -1,11 +1,3 @@
--- These queries are meant to delete any gameserver table you may have from
--- previous L2J installations.
---
--- Queries that create these tables and/or populate them apropiately are
--- available in the ../sql/ folder. See the documentation.txt file
--- for more details.
-
-DROP TABLE IF EXISTS
 account_gsdata,
 airships,
 auction,
@@ -15,7 +7,6 @@ auto_announcements,
 auto_chat_text,
 auto_chat,
 castle,
-castle_door,
 castle_doorupgrade,
 castle_functions,
 castle_manor_procure,
@@ -66,7 +57,6 @@ fort_doorupgrade,
 fort_functions,
 fort_siege_guards,
 fort_spawnlist,
-fort_staticobjects,
 fortsiege_clans,
 forums,
 four_sepulchers_spawnlist,