diff --git a/src/main/resources/sql/cleanup/cleanup.sql b/src/main/resources/sql/cleanup/cleanup.sql
index f83f1f5ddb82d44db167d6bfd502f106cf87ed8b..b7c7224edc9318363f5b8c7fa6a1232d138adf0b 100644
--- a/src/main/resources/sql/cleanup/cleanup.sql
+++ b/src/main/resources/sql/cleanup/cleanup.sql
@@ -1,119 +1,126 @@
--- These queries are meant to delete any gameserver table you may have from previous
--- L2J installations.
+-- These queries are meant to delete any game server table you may have from previous L2J installations.
 --
--- Queries that create these tables and/or populate them apropiately are available in
--- the ../sql/ folder.
+-- Queries that create these tables and/or populate them appropriately are available in the ../sql/ folder.
 --
 -- See the documentation.txt file for more details.
 
-DROP TABLE IF EXISTS
-account_gsdata,
-airships,
-announcements,
-auction,
-auction_bid,
-auction_watch,
-bbs_favorites,
-bot_reported_char_data,
-buylists,
-castle,
-castle_doorupgrade,
-castle_functions,
-castle_manor_procure,
-castle_manor_production,
-castle_siege_guards,
-castle_trapupgrade,
-character_contacts,
-character_friends,
-character_hennas,
-character_instance_time,
-character_item_reuse_save,
-character_macroses,
-character_offline_trade,
-character_offline_trade_items,
-character_pet_skills_save,
-character_premium_items,
-character_quest_global_data,
-character_quests,
-character_raid_points,
-character_recipebook,
-character_recipeshoplist,
-character_reco_bonus,
-character_shortcuts,
-character_skills,
-character_skills_save,
-character_subclasses,
-character_summon_skills_save,
-character_summons,
-character_tpbookmark,
-character_ui_actions,
-character_ui_categories,
-character_variables,
-characters,
-clan_data,
-clan_notices,
-clan_privs,
-clan_skills,
-clan_subpledges,
-clan_wars,
-clanhall,
-clanhall_functions,
-clanhall_siege_attackers,
-clanhall_siege_guards,
-crests,
-cursed_weapons,
-dimensional_rift,
-fort,
-fort_doorupgrade,
-fort_functions,
-fort_siege_guards,
-fort_spawnlist,
-fortsiege_clans,
-forums,
-four_sepulchers_spawnlist,
-games,
-global_tasks,
-global_variables,
-grandboss_data,
-grandboss_list,
-herb_droplist_groups,
-heroes,
-heroes_diary,
-item_attributes,
-item_auction,
-item_auction_bid,
-item_elementals,
-items,
-itemsonground,
-locations,
-merchant_lease,
-messages,
-mods_wedding,
-npc_buffer,
-olympiad_data,
-olympiad_fights,
-olympiad_nobles,
-olympiad_nobles_eom,
-petition_feedback,
-pets,
-pets_skills,
-posts,
-punishments,
-quest_global_data,
-raidboss_spawnlist,
-rainbowsprings_attacker_list,
-random_spawn,
-random_spawn_loc,
-seven_signs,
-seven_signs_festival,
-seven_signs_status,
-siegable_clanhall,
-siegable_hall_flagwar_attackers,
-siegable_hall_flagwar_attackers_members,
-siege_clans,
-spawnlist,
-teleport,
-territories,
-territory_registrations,
-territory_spawnlist,
-topic;
\ No newline at end of file
+-- Drop custom tables
+SET foreign_key_checks = 0;
+DROP TABLE IF EXISTS custom_buffer_service_ulists;
+DROP TABLE IF EXISTS custom_buffer_service_ulist_buffs;
+DROP TABLE IF EXISTS custom_npc_buffer;
+DROP TABLE IF EXISTS custom_spawnlist;
+DROP TABLE IF EXISTS custom_teleport;
+DROP TABLE IF EXISTS mods_wedding;
+SET foreign_key_checks = 1;
+-- Drop main tables
+DROP TABLE IF EXISTS account_gsdata;
+DROP TABLE IF EXISTS airships;
+DROP TABLE IF EXISTS announcements;
+DROP TABLE IF EXISTS auction;
+DROP TABLE IF EXISTS auction_bid;
+DROP TABLE IF EXISTS auction_watch;
+DROP TABLE IF EXISTS bbs_favorites;
+DROP TABLE IF EXISTS bot_reported_char_data;
+DROP TABLE IF EXISTS buylists;
+DROP TABLE IF EXISTS castle;
+DROP TABLE IF EXISTS castle_doorupgrade;
+DROP TABLE IF EXISTS castle_functions;
+DROP TABLE IF EXISTS castle_manor_procure;
+DROP TABLE IF EXISTS castle_manor_production;
+DROP TABLE IF EXISTS castle_siege_guards;
+DROP TABLE IF EXISTS castle_trapupgrade;
+DROP TABLE IF EXISTS character_contacts;
+DROP TABLE IF EXISTS character_friends;
+DROP TABLE IF EXISTS character_hennas;
+DROP TABLE IF EXISTS character_instance_time;
+DROP TABLE IF EXISTS character_item_reuse_save;
+DROP TABLE IF EXISTS character_macroses;
+DROP TABLE IF EXISTS character_offline_trade;
+DROP TABLE IF EXISTS character_offline_trade_items;
+DROP TABLE IF EXISTS character_pet_skills_save;
+DROP TABLE IF EXISTS character_premium_items;
+DROP TABLE IF EXISTS character_quest_global_data;
+DROP TABLE IF EXISTS character_quests;
+DROP TABLE IF EXISTS character_raid_points;
+DROP TABLE IF EXISTS character_recipebook;
+DROP TABLE IF EXISTS character_recipeshoplist;
+DROP TABLE IF EXISTS character_reco_bonus;
+DROP TABLE IF EXISTS character_shortcuts;
+DROP TABLE IF EXISTS character_skills;
+DROP TABLE IF EXISTS character_skills_save;
+DROP TABLE IF EXISTS character_subclasses;
+DROP TABLE IF EXISTS character_summon_skills_save;
+DROP TABLE IF EXISTS character_summons;
+DROP TABLE IF EXISTS character_tpbookmark;
+DROP TABLE IF EXISTS character_ui_actions;
+DROP TABLE IF EXISTS character_ui_categories;
+DROP TABLE IF EXISTS character_variables;
+DROP TABLE IF EXISTS characters;
+DROP TABLE IF EXISTS clan_data;
+DROP TABLE IF EXISTS clan_notices;
+DROP TABLE IF EXISTS clan_privs;
+DROP TABLE IF EXISTS clan_skills;
+DROP TABLE IF EXISTS clan_subpledges;
+DROP TABLE IF EXISTS clan_wars;
+DROP TABLE IF EXISTS clanhall;
+DROP TABLE IF EXISTS clanhall_functions;
+DROP TABLE IF EXISTS clanhall_siege_attackers;
+DROP TABLE IF EXISTS clanhall_siege_guards;
+DROP TABLE IF EXISTS crests;
+DROP TABLE IF EXISTS cursed_weapons;
+DROP TABLE IF EXISTS dimensional_rift;
+DROP TABLE IF EXISTS fort;
+DROP TABLE IF EXISTS fort_doorupgrade;
+DROP TABLE IF EXISTS fort_functions;
+DROP TABLE IF EXISTS fort_siege_guards;
+DROP TABLE IF EXISTS fort_spawnlist;
+DROP TABLE IF EXISTS fortsiege_clans;
+DROP TABLE IF EXISTS forums;
+DROP TABLE IF EXISTS four_sepulchers_spawnlist;
+DROP TABLE IF EXISTS games;
+DROP TABLE IF EXISTS global_tasks;
+DROP TABLE IF EXISTS global_variables;
+DROP TABLE IF EXISTS grandboss_data;
+DROP TABLE IF EXISTS grandboss_list;
+DROP TABLE IF EXISTS herb_droplist_groups;
+DROP TABLE IF EXISTS heroes;
+DROP TABLE IF EXISTS heroes_diary;
+DROP TABLE IF EXISTS item_attributes;
+DROP TABLE IF EXISTS item_auction;
+DROP TABLE IF EXISTS item_auction_bid;
+DROP TABLE IF EXISTS item_elementals;
+DROP TABLE IF EXISTS items;
+DROP TABLE IF EXISTS itemsonground;
+DROP TABLE IF EXISTS locations;
+DROP TABLE IF EXISTS merchant_lease;
+DROP TABLE IF EXISTS messages;
+DROP TABLE IF EXISTS mods_wedding;
+DROP TABLE IF EXISTS npc_buffer;
+DROP TABLE IF EXISTS olympiad_data;
+DROP TABLE IF EXISTS olympiad_fights;
+DROP TABLE IF EXISTS olympiad_nobles;
+DROP TABLE IF EXISTS olympiad_nobles_eom;
+DROP TABLE IF EXISTS petition_feedback;
+DROP TABLE IF EXISTS pets;
+DROP TABLE IF EXISTS pets_skills;
+DROP TABLE IF EXISTS posts;
+DROP TABLE IF EXISTS punishments;
+DROP TABLE IF EXISTS quest_global_data;
+DROP TABLE IF EXISTS raidboss_spawnlist;
+DROP TABLE IF EXISTS rainbowsprings_attacker_list;
+DROP TABLE IF EXISTS random_spawn;
+DROP TABLE IF EXISTS random_spawn_loc;
+DROP TABLE IF EXISTS seven_signs;
+DROP TABLE IF EXISTS seven_signs_festival;
+DROP TABLE IF EXISTS seven_signs_status;
+DROP TABLE IF EXISTS siegable_clanhall;
+DROP TABLE IF EXISTS siegable_hall_flagwar_attackers;
+DROP TABLE IF EXISTS siegable_hall_flagwar_attackers_members;
+DROP TABLE IF EXISTS siege_clans;
+DROP TABLE IF EXISTS spawnlist;
+DROP TABLE IF EXISTS teleport;
+DROP TABLE IF EXISTS territories;
+DROP TABLE IF EXISTS territory_registrations;
+DROP TABLE IF EXISTS territory_spawnlist;
+DROP TABLE IF EXISTS topic;
\ No newline at end of file
diff --git a/src/main/resources/sql/documentation.txt b/src/main/resources/sql/documentation.txt
index d25072436a42ab8709e670fc025a1e1e440b70c8..fc06ab9935f41300922ee27ef45e943e08094eaa 100644
--- a/src/main/resources/sql/documentation.txt
+++ b/src/main/resources/sql/documentation.txt
@@ -1,3 +1,3 @@
-This directory contains tables required by the Game Server.
+This directory contains tables required by the game server.
 
 Eventually, additional SQL scripts are locates in: custom/mods/updates folders.
\ No newline at end of file