diff --git a/trunk/dist/game/data_classic/html/admin/teleports/OtherLocations.htm b/trunk/dist/game/data_classic/html/admin/teleports/OtherLocations.htm
index 6b09eb2ce4..6c226cebfe 100644
--- a/trunk/dist/game/data_classic/html/admin/teleports/OtherLocations.htm
+++ b/trunk/dist/game/data_classic/html/admin/teleports/OtherLocations.htm
@@ -5,10 +5,7 @@
 <td align=center width=176>Others Locations</td>
 <td align=center><button value="Back" action="bypass -h admin_show_moves" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
-<table width=256><tr>
-<td align=center><button action="bypass -h admin_move_to -59193 -56893 -2039" value="Fantasy Island" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_move_to -56748 -56344 -2008" value="Fantasy Show" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
+<table width=256>
 <tr>
 <td align=center><button action="bypass -h admin_move_to -114542 -251005 -2992" value="GM Room" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td align=center><button action="bypass -h admin_move_to -112959 -251147 -2992" value="GM Room Solo 1" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
@@ -19,10 +16,7 @@
 </tr>
 <tr>
 <td align=center><button action="bypass -h admin_move_to -113360 -244676 -15536" value="Bosses Rest Room" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_move_to -87029 -16399 -8325" value="Kratei's Cube 1" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
-<tr>
-<td align=center><button action="bypass -h admin_move_to -86966 -81809 -8357" value="Kratei's Cube 2" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table>
+</table>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas.htm b/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas.htm
index 3c3f5b45b6..976d3e944e 100644
--- a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas.htm
+++ b/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas.htm
@@ -18,19 +18,12 @@
 <td align=center><button action="bypass -h admin_html teleports/WorldAreas/InnadrilTerritory.htm" value="Innadril Territory" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 <tr>
+<td align=center><button action="bypass -h admin_html teleports/WorldAreas/GoddardTerritory.htm" value="Goddard Territory" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td align=center><button action="bypass -h admin_html teleports/WorldAreas/SchuttgartTerritory.htm" value="Schuttgart Territory" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_html teleports/WorldAreas/Border.htm" value="Border" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 <tr>
-<td align=center><button action="bypass -h admin_html teleports/WorldAreas/GoddardTerritory.htm" value="Goddard Territory" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td align=center><button action="bypass -h admin_html teleports/WorldAreas/RuneTerritory.htm" value="Rune Territory" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
-<tr>
-<td align=center><button action="bypass -h admin_html teleports/WorldAreas/RombarshyaTerritory.htm" value="Rombarshya Territory" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center><button action="bypass -h admin_html teleports/WorldAreas/CardiffTerritory.htm" value="Cardiff Territory" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr>
-<tr>
-<td align=center><button action="bypass -h admin_html teleports/WorldAreas/MagmeldTerritory.htm" value="Magmeld Territory" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table>
+</table>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/Border.htm b/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/Border.htm
deleted file mode 100644
index 8f13046b34..0000000000
--- a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/Border.htm
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><title>Admin Teleports</title><body>
-<center>
-<table width=256><tr>
-<td align=center><button value="Main" action="bypass -h admin_admin" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center width=176>Border</td>
-<td align=center><button value="Back" action="bypass -h admin_html teleports/WorldAreas.htm" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table><br>
-<font color="LEVEL">Fields</font><br1>
-<button action="bypass -h admin_move_to -114592 -152509 -6723" value="Delusion Chamber" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
-<font color="LEVEL">Dungeons</font><br1>
-<button action="bypass -h admin_move_to -79184 111952 -4897" value="Oracle of Dawn" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -80208 87120 -5153" value="Oracle of Dusk" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -114790 -180576 -6756" value="Dimensional Rift" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
-<font color="LEVEL">Arena</font><br1>
-<button action="bypass -h admin_move_to -21453 -21058 -3024" value="Olympiad Stadium" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
-</center>
-</body></html>
\ No newline at end of file
diff --git a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/CardiffTerritory.htm b/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/CardiffTerritory.htm
deleted file mode 100644
index 475c7fb133..0000000000
--- a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/CardiffTerritory.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><title>Admin Teleports</title><body>
-<center>
-<table width=256><tr>
-<td align=center><button value="Main" action="bypass -h admin_admin" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center width=176>Cardiff Territory</td>
-<td align=center><button value="Back" action="bypass -h admin_html teleports/WorldAreas.htm" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table><br>
-<font color="LEVEL">Dungeons</font><br1>
-<button action="bypass -h admin_move_to -175520 154505 2712" value="Seed of Annihilation" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -147348 152527 -14056" value="Seed of Hellfire" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
-</center>
-</body></html>
\ No newline at end of file
diff --git a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/MagmeldTerritory-1.htm b/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/MagmeldTerritory-1.htm
deleted file mode 100644
index cc6809147f..0000000000
--- a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/MagmeldTerritory-1.htm
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><title>Admin Teleports</title><body>
-<center>
-<table width=256><tr>
-<td align=center><button value="Main" action="bypass -h admin_admin" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center width=176>Magmeld Territory</td>
-<td align=center><button value="Back" action="bypass -h admin_html teleports/WorldAreas/MagmeldTerritory.htm" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table><br>
-<font color="LEVEL">Orbis Temple</font><br1>
-<button action="bypass -h admin_move_to 198676 86609 -137" value="Orbis Temple Entrance" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 213023 51135 -8412" value="Orbis Temple 1st Floor" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 213022 50440 -14640" value="Orbis Temple 2nd Floor" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 214314 115388 -12741" value="Orbis Temple 3rd Floor" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 224910 68728 1626" value="The Lair of Octavis" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
-</center>
-</body></html>
\ No newline at end of file
diff --git a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/MagmeldTerritory.htm b/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/MagmeldTerritory.htm
deleted file mode 100644
index a0b7b8d358..0000000000
--- a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/MagmeldTerritory.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><title>Admin Teleports</title><body>
-<center>
-<table width=256><tr>
-<td align=center><button value="Main" action="bypass -h admin_admin" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center width=176>Magmeld Territory</td>
-<td align=center><button value="Back" action="bypass -h admin_html teleports/WorldAreas.htm" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table><br>
-<font color="LEVEL">Fields</font><br1>
-<button action="bypass -h admin_move_to 207868 112199 -2063" value="Garden of Genesis" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 214361 80813 821" value="Fairy Settlement" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
-<font color="LEVEL">Dungeons</font><br1>
-<button action="bypass -h admin_html teleports/WorldAreas/MagmeldTerritory-1.htm" value="Orbis Temple" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
-<font color="LEVEL">Others</font><br1>
-<button action="bypass -h admin_move_to 224910 68728 1626" value="Kimerian Cavern" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
-</center>
-</body></html>
\ No newline at end of file
diff --git a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/RombarshyaTerritory.htm b/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/RombarshyaTerritory.htm
deleted file mode 100644
index 44c7ad3e38..0000000000
--- a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/RombarshyaTerritory.htm
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><title>Admin Teleports</title><body>
-<center>
-<table width=256><tr>
-<td align=center><button value="Main" action="bypass -h admin_admin" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center width=176>Rombarshya Territory</td>
-<td align=center><button value="Back" action="bypass -h admin_html teleports/WorldAreas.htm" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table><br>
-<font color="LEVEL">Dungeons</font><br1>
-<button action="bypass -h admin_move_to -247012 251804 4340" value="Seed of Destruction" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to -213678 210670 4408" value="Seed of Infinity" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
-<font color="LEVEL">Town</font><br1>
-<button action="bypass -h admin_move_to -186742 244167 2670" value="Keucereus Alliance Base" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
-<font color="LEVEL">Arena</font><br1>
-<button action="bypass -h admin_move_to -213473 244899 2017" value="Aerial Cleft" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
-</center>
-</body></html>
\ No newline at end of file
diff --git a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/RuneTerritory-2.htm b/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/RuneTerritory-2.htm
deleted file mode 100644
index f3dc7346f1..0000000000
--- a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/RuneTerritory-2.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<html><title>Admin Teleports</title><body>
-<center>
-<table width=256><tr>
-<td align=center><button value="Main" action="bypass -h admin_admin" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td align=center width=176>Rune Territory - Primeval Isle</td>
-<td align=center><button value="Back" action="bypass -h admin_html teleports/WorldAreas/RuneTerritory.htm" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table><br>
-<center>
-<button action="bypass -h admin_move_to 10468 -24569 -3650" value="Primeval Isle Wharf" width=150 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 6229 -2924 -2965" value="Research Facility" width=150 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 26174 -17134 -2747" value="Lost Nest" width=150 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 8264 -14431 -3696" value="Primeval Plains" width=150 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
-</center>
-</body></html>
\ No newline at end of file
diff --git a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/RuneTerritory.htm b/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/RuneTerritory.htm
index 612319ca04..722f0885eb 100644
--- a/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/RuneTerritory.htm
+++ b/trunk/dist/game/data_classic/html/admin/teleports/WorldAreas/RuneTerritory.htm
@@ -10,7 +10,6 @@
 <button action="bypass -h admin_html teleports/WorldAreas/RuneTerritory-4.htm" value="Valley of Saints" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 52107 -54328 -3158" value="Forest of the Dead" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 69340 -50203 -3314" value="Swamp of Screams" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_html teleports/WorldAreas/RuneTerritory-2.htm" value="Primeval Isle" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br>
 <font color="LEVEL">Dungeons</font><br1>
 <button action="bypass -h admin_html teleports/WorldAreas/RuneTerritory-3.htm" value="Monastery of Silence" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_html teleports/WorldAreas/RuneTerritory-1.htm" value="The Pagan Temple" width=210 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>