diff --git a/support_files/definitions/south_america/mexico/country_mexico.xml b/support_files/definitions/south_america/mexico/country_mexico.xml
deleted file mode 100644
index 6526ab7a..00000000
--- a/support_files/definitions/south_america/mexico/country_mexico.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<country>
-	<name>México</name>
-	<rating>5</rating>
-	<leagues>
-		<league>mexico1</league>
-		<league>mexico2</league>
-		<league>mexico3-1</league>
-		<league>mexico3-2</league>
-		<league>mexico3-3</league>
-		<league>mexico3-4</league>
-		<league>mexico3-5</league>
-	</leagues>
-	<cups>
-		<cup>mexico1_apertura</cup>
-		<cup>mexico1_clausura</cup>
-		<cup>mexico2_apertura</cup>
-		<cup>mexico2_clausura</cup>
-		<cup>mexico3_apertura</cup>
-		<cup>mexico3_clausura</cup>
-		<cup>mexico_concacaf</cup>
-		<cup>mexico_libertadores</cup>
-		<cup>mexico_superliga</cup>
-		<cup>prom_games_mexico2</cup>
-	</cups>
-</country>
diff --git a/support_files/definitions/south_america/mexico/cup_apertura.xml b/support_files/definitions/south_america/mexico/cup_apertura.xml
deleted file mode 100644
index e69de29b..00000000
diff --git a/support_files/definitions/south_america/mexico/cup_mexico1_apertura.xml b/support_files/definitions/south_america/mexico/cup_mexico1_apertura.xml
deleted file mode 100644
index 6a17a51c..00000000
--- a/support_files/definitions/south_america/mexico/cup_mexico1_apertura.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-	<name>Primera Division Torneo Apertura</name>
-	<short_name>1a Apertura</short_name>
-	<sid>mexico1_apertura</sid>
-	<property>national</property>
-	<add_week>16</add_week>
-	<week_gap>1</week_gap>
-	<last_week>19</last_week>
-
-	
-	<cup_rounds>
-		<cup_round>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>mexico1</choose_team_sid>
-					<number_of_teams>10</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>10</end_idx>
-				</choose_team>
-			</choose_teams>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-	</cup_rounds>
-</cup>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/cup_mexico1_clausadura.xml b/support_files/definitions/south_america/mexico/cup_mexico1_clausadura.xml
deleted file mode 100644
index 69abaa2a..00000000
--- a/support_files/definitions/south_america/mexico/cup_mexico1_clausadura.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-	<name>México Liga Primera Torneo Clausadura</name>
-	<short_name>México Clausadura</short_name>
-	<sid>mexico1_clausadura</sid>
-	<property>national</property>
-	<add_week>22</add_week>
-	<last_week>46</last_week>
-	
-	<cup_rounds>
-		<cup_round>
-			<randomise_teams>1</randomise_teams>
-			<number_of_groups>3</number_of_groups>
-			<number_of_advance>1</number_of_advance>
-			<number_of_best_advance>5</number_of_best_advance>
-			<round_robins>3</round_robins>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>mexico1</choose_team_sid>
-				</choose_team>
-			</choose_teams>
-		</cup_round>
-		<cup_round>
-			<home_away>1</home_away>
-		</cup_round>
-		<cup_round>
-			<home_away>1</home_away>
-		</cup_round>
-		<cup_round>
-			<neutral>1</neutral>
-		</cup_round>
-	</cup_rounds>
-</cup>
diff --git a/support_files/definitions/south_america/mexico/cup_mexico1_clausura.xml b/support_files/definitions/south_america/mexico/cup_mexico1_clausura.xml
deleted file mode 100644
index d7ffe705..00000000
--- a/support_files/definitions/south_america/mexico/cup_mexico1_clausura.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-	<name>Primera Division Torneo Clausura</name>
-	<short_name>1a Clausura</short_name>
-	<sid>mexico1_clausura</sid>
-	<property>national</property>
-	<property>highlight3</property>
-	<add_week>41</add_week>
-	<week_gap>1</week_gap>
-	<last_week>44</last_week>
-	
-	
-	<cup_rounds>
-		<cup_round>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>mexico1</choose_team_sid>
-					<number_of_teams>10</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>10</end_idx>
-				</choose_team>
-			</choose_teams>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-	</cup_rounds>
-</cup>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/cup_mexico2_apertura.xml b/support_files/definitions/south_america/mexico/cup_mexico2_apertura.xml
deleted file mode 100644
index 150ce080..00000000
--- a/support_files/definitions/south_america/mexico/cup_mexico2_apertura.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-	<name>Primera "a" Division Torneo Apertura</name>
-	<short_name>1a "a" Apertura</short_name>
-	<sid>mexico2_apertura</sid>
-	<property>national</property>
-	<add_week>17</add_week>
-	<week_gap>1</week_gap>
-	<last_week>19</last_week>
-	
-	<cup_rounds>
-		<cup_round>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>mexico2</choose_team_sid>
-					<number_of_teams>8</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>8</end_idx>
-				</choose_team>
-			</choose_teams>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-	</cup_rounds>
-</cup>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/cup_mexico2_clausura.xml b/support_files/definitions/south_america/mexico/cup_mexico2_clausura.xml
deleted file mode 100644
index 4ff56677..00000000
--- a/support_files/definitions/south_america/mexico/cup_mexico2_clausura.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-	<name>Primera "a" Division Torneo Clausura</name>
-	<short_name>1a "a" Clausura</short_name>
-	<sid>mexico2_clausura</sid>
-	<property>national</property>
-	<property>highlight3</property>
-	<add_week>42</add_week>
-	<week_gap>1</week_gap>
-	<last_week>44</last_week>
-	
-	<cup_rounds>
-		<cup_round>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>mexico2</choose_team_sid>
-					<number_of_teams>8</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>8</end_idx>
-				</choose_team>
-			</choose_teams>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-	</cup_rounds>
-</cup>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/cup_mexico3_apertura.xml b/support_files/definitions/south_america/mexico/cup_mexico3_apertura.xml
deleted file mode 100644
index e702b1d0..00000000
--- a/support_files/definitions/south_america/mexico/cup_mexico3_apertura.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-	<name>Segunda Division Torneo Apertura</name>
-	<short_name>2a Apertura</short_name>
-	<sid>mexico3_apertura</sid>
-	<property>national</property>
-	<add_week>16</add_week>
-	<week_gap>1</week_gap>
-	<last_week>19</last_week>
-	
-	<cup_rounds>
-		<cup_round>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>mexico3-5</choose_team_sid>
-					<number_of_teams>3</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-3</choose_team_sid>
-					<number_of_teams>4</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>4</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>3</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-4</choose_team_sid>
-					<number_of_teams>3</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-2</choose_team_sid>
-					<number_of_teams>3</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-1</choose_team_sid>
-					<number_of_teams>2</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>2</end_idx>
-				</choose_team>
-			</choose_teams>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-	</cup_rounds>
-</cup>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/cup_mexico3_clausura.xml b/support_files/definitions/south_america/mexico/cup_mexico3_clausura.xml
deleted file mode 100644
index 89a17f78..00000000
--- a/support_files/definitions/south_america/mexico/cup_mexico3_clausura.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-	<name>Segunda Division Torneo Clausura</name>
-	<short_name>2a Clausura</short_name>
-	<sid>mexico3_clausura</sid>
-	<property>national</property>
-	<property>highlight3</property>
-	<add_week>41</add_week>
-	<week_gap>1</week_gap>
-	<last_week>44</last_week>
-	
-	<cup_rounds>
-		<cup_round>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>mexico3-5</choose_team_sid>
-					<number_of_teams>3</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-3</choose_team_sid>
-					<number_of_teams>4</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>4</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>3</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-4</choose_team_sid>
-					<number_of_teams>3</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-2</choose_team_sid>
-					<number_of_teams>3</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-1</choose_team_sid>
-					<number_of_teams>2</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>2</end_idx>
-				</choose_team>
-			</choose_teams>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-	</cup_rounds>
-</cup>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/cup_mexico_concacaf.xml b/support_files/definitions/south_america/mexico/cup_mexico_concacaf.xml
deleted file mode 100644
index 6bb0c66b..00000000
--- a/support_files/definitions/south_america/mexico/cup_mexico_concacaf.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>	
-<cup>
-	<name>CONCACAF Copa de Campeones</name>
-	<short_name>CONCACAF</short_name>
-	<sid>mexico_concacaf</sid>
-	<talent_diff>-500</talent_diff>
-	<yellow_red>3</yellow_red>
-	<last_week>40</last_week>
-	<week_gap>2</week_gap>
-	<group>1507</group>
-	<property>international</property>
-	<property>highlight1</property>
-	
-	<cup_rounds>
-		<cup_round>
-			<new_teams>8</new_teams>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>LEAGUE1</choose_team_sid>
-					<number_of_teams>2</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>2</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>costa_rica1_short</choose_team_sid>
-					<number_of_teams>2</number_of_teams>
-					<randomly>1</randomly>
-					<generate>1</generate>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>honduras1_short</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<randomly>1</randomly>
-					<generate>1</generate>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>jamaica1_short</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<randomly>1</randomly>
-					<generate>1</generate>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico1</choose_team_sid>
-					<number_of_teams>2</number_of_teams>
-					<randomly>1</randomly>
-					<generate>1</generate>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>usa_econf</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<randomly>1</randomly>
-					<generate>1</generate>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>usa_wconf</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<randomly>1</randomly>
-					<generate>1</generate>
-				</choose_team>
-			</choose_teams>
-		</cup_round>
-		<cup_round>
-		</cup_round>
-		<cup_round>
-		</cup_round>
-	</cup_rounds>
-</cup>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/cup_mexico_libertadores.xml b/support_files/definitions/south_america/mexico/cup_mexico_libertadores.xml
deleted file mode 100644
index 350bded0..00000000
--- a/support_files/definitions/south_america/mexico/cup_mexico_libertadores.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>	
-<cup>
-  <name>Copa Libertadores</name>
-  <short_name>CL</short_name>
-  <sid>mexico_libertadores</sid>
-  <talent_diff>500</talent_diff>
-  <yellow_red>3</yellow_red>
-  <add_week>0</add_week>
-  <last_week>51</last_week>
-  <week_gap>2</week_gap>
-  <group>1505</group>
-  <property>international</property>
-  <property>highlight1</property>
-
-  <cup_rounds>
-
-	  <cup_round>
-		  <new_teams>12</new_teams>
-		  <byes>0</byes>
-		  
-		  <choose_teams>
-			  <choose_team>
-				  <choose_team_sid>argentina1</choose_team_sid>
-				  <number_of_teams>1</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>brazil1</choose_team_sid>
-				  <number_of_teams>2</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>colombia1_short</choose_team_sid>
-				  <number_of_teams>1</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>ecuador1_short</choose_team_sid>
-				  <number_of_teams>1</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>paraguay1_short</choose_team_sid>
-				  <number_of_teams>1</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>venezuela1_short</choose_team_sid>
-				  <number_of_teams>1</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>chile1_short</choose_team_sid>
-				  <number_of_teams>1</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>uruguay1_short</choose_team_sid>
-				  <number_of_teams>1</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>bolivia1_short</choose_team_sid>
-				  <number_of_teams>1</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>peru1_short</choose_team_sid>
-				  <number_of_teams>1</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>mexico1</choose_team_sid>
-				  <number_of_teams>1</number_of_teams>
-				  <start_idx>5</start_idx>
-				  <end_idx>5</end_idx>
-			  </choose_team>
-			  
-		  </choose_teams> 
-	  </cup_round>
-	  
-	  <cup_round>
-		  <new_teams>26</new_teams>
-		  <number_of_groups>8</number_of_groups>
-		  <number_of_advance>2</number_of_advance>
-		  
-		  <choose_teams>
-			  <choose_team>
-				  <choose_team_sid>argentina1</choose_team_sid>
-				  <number_of_teams>4</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>brazil1</choose_team_sid>
-				  <number_of_teams>4</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>mexico1</choose_team_sid>
-				  <number_of_teams>2</number_of_teams>
-				  <start_idx>3</start_idx>
-				  <end_idx>4</end_idx>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>colombia1_short</choose_team_sid>
-				  <number_of_teams>2</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>ecuador1_short</choose_team_sid>
-				  <number_of_teams>2</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>paraguay1_short</choose_team_sid>
-				  <number_of_teams>2</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>venezuela1_short</choose_team_sid>
-				  <number_of_teams>2</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>chile1_short</choose_team_sid>
-				  <number_of_teams>2</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>uruguay1_short</choose_team_sid>
-				  <number_of_teams>2</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>bolivia1_short</choose_team_sid>
-				  <number_of_teams>2</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-			  
-			  <choose_team>
-				  <choose_team_sid>peru1_short</choose_team_sid>
-				  <number_of_teams>2</number_of_teams>
-				  <randomly>1</randomly>
-				  <generate>1</generate>
-			  </choose_team>
-		  </choose_teams>
-		  
-	  </cup_round>
-	  
-	  <cup_round></cup_round>
-	  <cup_round></cup_round>
-	  <cup_round></cup_round>
-	  <cup_round></cup_round>
-  </cup_rounds>
-</cup>
diff --git a/support_files/definitions/south_america/mexico/cup_mexico_superliga.xml b/support_files/definitions/south_america/mexico/cup_mexico_superliga.xml
deleted file mode 100644
index 88c1be8d..00000000
--- a/support_files/definitions/south_america/mexico/cup_mexico_superliga.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>	
-<cup>
-	<name>USA/Mexico SuperLiga</name>
-	<short_name>SuperLiga</short_name>
-	<sid>mexico_superliga</sid>
-	<talent_diff>100</talent_diff>
-	<group>1505</group>
-	<yellow_red>3</yellow_red>
-	<add_week>18</add_week>
-	<last_week>51</last_week>
-	<week_gap>1</week_gap>
-	<property>international</property>
-	
-	<cup_round>
-		<home_away>0</home_away>
-		<neutral>1</neutral>
-		<number_of_groups>2</number_of_groups>
-		<number_of_advance>2</number_of_advance>
-		<new_teams>8</new_teams>
-		<choose_teams>
-			<choose_team>
-				<choose_team_sid>LEAGUE1</choose_team_sid>
-				<number_of_teams>4</number_of_teams>
-				<start_idx>1</start_idx>
-				<end_idx>7</end_idx>
-			</choose_team>
-			<choose_team>
-				<choose_team_sid>usa_econf</choose_team_sid>
-				<number_of_teams>2</number_of_teams>
-				<randomly>1</randomly>
-				<generate>1</generate>
-			</choose_team>
-			<choose_team>
-				<choose_team_sid>usa_wconf</choose_team_sid>
-				<number_of_teams>2</number_of_teams>
-				<randomly>1</randomly>
-				<generate>1</generate>
-			</choose_team>
-		</choose_teams>
-		<two_match_week>1</two_match_week>
-	</cup_round>
-	<cup_round>
-		<home_away>0</home_away>
-		<neutral>1</neutral>
-	</cup_round>
-	<cup_round>
-		<home_away>0</home_away>
-		<neutral>1</neutral>
-	</cup_round>
-</cup>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/cup_prom_games_mexico1.xml b/support_files/definitions/south_america/mexico/cup_prom_games_mexico1.xml
deleted file mode 100644
index 8a632bd0..00000000
--- a/support_files/definitions/south_america/mexico/cup_prom_games_mexico1.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-	<name>Campeon de Primera "a"</name>
-	<short_name>1a Promocion</short_name>
-	<sid>prom_games_mexico1</sid>
-	<property>promotion</property>
-	<add_week>54</add_week>
-	<week_gap>1</week_gap>
-	<last_week>55</last_week>
-	
-	<cup_rounds>
-		<cup_round>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>CUP4</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>1</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>CUP2</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>1</end_idx>
-				</choose_team>
-			</choose_teams>
-		</cup_round>
-	</cup_rounds>
-</cup>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/cup_prom_games_mexico2.xml b/support_files/definitions/south_america/mexico/cup_prom_games_mexico2.xml
deleted file mode 100644
index baafff33..00000000
--- a/support_files/definitions/south_america/mexico/cup_prom_games_mexico2.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-	<name>Segunda Division Torneo Clausura</name>
-	<short_name>2a Clausura</short_name>
-	<!--<name>Promocion a 1a "a"</name>
-	<short_name>1a "a" Promocion</short_name>-->
-	<sid>prom_games_mexico2</sid>
-	<property>promotion</property>
-	<property>highlight2</property>
-	<group>1620</group>
-	<add_week>1000</add_week>
-	<week_gap>1</week_gap>
-	<last_week>48</last_week>
-	
-	<cup_rounds>
-		<cup_round>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>mexico3-5</choose_team_sid>
-					<number_of_teams>3</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-3</choose_team_sid>
-					<number_of_teams>4</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>4</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>3</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-4</choose_team_sid>
-					<number_of_teams>3</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-2</choose_team_sid>
-					<number_of_teams>3</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>3</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-1</choose_team_sid>
-					<number_of_teams>2</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>2</end_idx>
-				</choose_team>
-			</choose_teams>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-		<cup_round>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>mexico2</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>24</start_idx>
-					<end_idx>24</end_idx>
-				</choose_team>
-			</choose_teams>
-			<two_match_week>1</two_match_week>
-		</cup_round>
-	</cup_rounds>
-</cup>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/league_mexico1.xml b/support_files/definitions/south_america/mexico/league_mexico1.xml
deleted file mode 100644
index 210bb754..00000000
--- a/support_files/definitions/south_america/mexico/league_mexico1.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-	<sid>mexico1</sid>
-	<name>Primera Division</name>
-	<short_name>1a Division</short_name>
-	<symbol>flag_mexico.png</symbol>
-	<layer>1</layer>
-	<first_week>1</first_week>
-	<week_gap>1</week_gap>
-	<average_talent>8600</average_talent>
-	<yellow_red>3</yellow_red>
-	<round_robins>2</round_robins>
-	<names_file>latinoamerica</names_file>
-	<break>11</break>
-	<two_match_week_start>3</two_match_week_start>
-	<two_match_week_end>6</two_match_week_end>
-	<two_match_week_start>20</two_match_week_start>
-	<two_match_week_end>21</two_match_week_end>
-	<two_match_week_start>23</two_match_week_start>
-	<two_match_week_end>24</two_match_week_end>
-	
-	<prom_rel>
-		<prom_rel_element>
-			<rank_start>18</rank_start>
-			<rank_end>18</rank_end>
-			<dest_sid>mexico2</dest_sid>
-			<prom_rel_type>relegation</prom_rel_type>
-		</prom_rel_element>
-	</prom_rel>
-	
-	<teams>
-		<team>
-			<team_name>C.A. México City</team_name>
-		</team>
-		<team>
-			<team_name>Pachuca</team_name>
-		</team>
-		<team>
-			<team_name>C.F.A. México City</team_name>
-		</team>
-		<team>
-			<team_name>Toluca</team_name>
-		</team>
-		<team>
-			<team_name>Monterrey</team_name>
-		</team>
-		<team>
-			<team_name>J. C. Tuxtla Gutierrez</team_name>
-		</team>
-		<team>
-			<team_name>N. Aguascalientes</team_name>
-		</team>
-		<team>
-			<team_name>U.A.G. Zapopán</team_name>
-		</team>
-		<team>
-			<team_name>Monterrey T.</team_name>
-		</team>
-		<team>
-			<team_name>Morelia</team_name>
-		</team>
-		<team>
-			<team_name>México City A.</team_name>
-		</team>
-		<team>
-			<team_name>C.D. Guadalajara</team_name>
-		</team>
-		<team>
-			<team_name>C.F.A. Guadalajara</team_name>
-		</team>
-		<team>
-			<team_name>San Luis Potosí</team_name>
-		</team>
-		<team>
-			<team_name>S.L. Torreón</team_name>
-		</team>
-		<team>
-			<team_name>México City P.</team_name>
-		</team>
-		<team>
-			<team_name>Veracruz</team_name>
-		</team>
-		<team>
-			<team_name>Querétaro</team_name>
-		</team>
-  </teams>
-</league>
diff --git a/support_files/definitions/south_america/mexico/league_mexico2.xml b/support_files/definitions/south_america/mexico/league_mexico2.xml
deleted file mode 100644
index 0a768ab6..00000000
--- a/support_files/definitions/south_america/mexico/league_mexico2.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-	<sid>mexico2</sid>
-	<name>Primera "a" Division</name>
-	<short_name>1a "a"</short_name>
-	<symbol>flag_mexico.png</symbol>
-	<layer>2</layer>
-	<first_week>1</first_week>
-	<week_gap>1</week_gap>
-	<average_talent>7550</average_talent>
-	<yellow_red>3</yellow_red>
-	<round_robins>2</round_robins>
-	<names_file>latinoamerica</names_file>
-	<break>10</break>
-	<two_match_week_start>3</two_match_week_start>
-	<two_match_week_end>16</two_match_week_end>
-	<two_match_week_start>26</two_match_week_start>
-	<two_match_week_end>39</two_match_week_end>
-	
-	<prom_rel>
-		<prom_games>
-			<prom_games_dest_sid>mexico2</prom_games_dest_sid>
-			<prom_games_loser_sid>mexico3-1 mexico3-2 mexico3-3 mexico3-4 mexico3-5</prom_games_loser_sid>
-			<prom_games_number_of_advance>1</prom_games_number_of_advance>
-			<prom_games_cup_sid>prom_games_mexico2</prom_games_cup_sid>
-		</prom_games>
-		
-		<prom_rel_element>
-			<rank_start>1</rank_start>
-			<rank_end>1</rank_end>
-			<dest_sid>mexico1</dest_sid>
-			<prom_rel_type>promotion</prom_rel_type>
-		</prom_rel_element>
-	</prom_rel>
-	
-	<teams>
-		<team>
-			<team_name>Zapotlanejo A.</team_name>
-		</team>
-		<team>
-			<team_name>Culiacán D.S.</team_name>
-		</team>
-		<team>
-			<team_name>Durango</team_name>
-		</team>
-		<team>
-			<team_name>León</team_name>
-		</team>
-		<team>
-			<team_name>Morelia M.A.</team_name>
-		</team>
-		<team>
-			<team_name>P.R. Colima</team_name>
-		</team>
-		<team>
-			<team_name>Celaya</team_name>
-		</team>
-		<team>
-			<team_name>P. Salamanca</team_name>
-		</team>
-		<team>
-			<team_name>Torreón S.L.A.</team_name>
-		</team>
-		<team>
-			<team_name>Guadalajara T.</team_name>
-		</team>
-		<team>
-			<team_name>U.A.G. Zapopán A.</team_name>
-		</team>
-		<team>
-			<team_name>T. Los Mochis</team_name>
-		</team>
-		<team>
-			<team_name>Toluca A.M.</team_name>
-		</team>
-		<team>
-			<team_name>C.A. Hidalgo</team_name>
-		</team>
-		<team>
-			<team_name>I. Ciudad Juárez</team_name>
-		</team>
-		<team>
-			<team_name>Puebla L.B.</team_name>
-		</team>
-		<team>
-			<team_name>Monterrey R.A.</team_name>
-		</team>
-		<team>
-			<team_name>Puebla</team_name>
-		</team>
-		<team>
-			<team_name>Cuernavaca P.M.</team_name>
-		</team>
-		<team>
-			<team_name>Tijuana X.C.</team_name>
-		</team>
-		<team>
-			<team_name>Tampico M.F.</team_name>
-		</team>
-		<team>
-			<team_name>Coatzacoalcos T.R.</team_name>
-		</team>
-		<team>
-			<team_name>Ciudad Victoria C.</team_name>
-		</team>
-		<team>
-			<team_name>México City S.A.</team_name>
-		</team>
-	</teams>
-</league>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/league_mexico3-1.xml b/support_files/definitions/south_america/mexico/league_mexico3-1.xml
deleted file mode 100644
index 42923c4e..00000000
--- a/support_files/definitions/south_america/mexico/league_mexico3-1.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-	<sid>mexico3-1</sid>
-	<name>Segunda Division Zona Bajio</name>
-	<short_name>2a Bajio</short_name>
-	<symbol>flag_mexico.png</symbol>
-	<layer>3</layer>
-	<first_week>3</first_week>
-	<week_gap>1</week_gap>
-	<average_talent>6500</average_talent>
-	<yellow_red>3</yellow_red>
-	<round_robins>2</round_robins>
-	<names_file>latinoamerica</names_file>
-	<break>13</break>
-	
-	<teams>
-		<team>
-			<team_name>C.A. Hidalgo</team_name>
-		</team>
-		<team>
-			<team_name>P. Salamanca</team_name>
-		</team>
-		<team>
-			<team_name>C.D. Irapuato</team_name>
-		</team>
-		<team>
-			<team_name>F.C. Celaya</team_name>
-		</team>
-		<team>
-			<team_name>T. Naucalpan</team_name>
-		</team>
-		<team>
-			<team_name>A.C. Aguascalientes</team_name>
-		</team>
-		<team>
-			<team_name>Apatzingan</team_name>
-		</team>
-		<team>
-			<team_name>Necaxa R.</team_name>
-		</team>
-		<team>
-			<team_name>A.C. Leon</team_name>
-		</team>
-		<team>
-			<team_name>A.R. Tantoyuca</team_name>
-		</team>
-		<team>
-			<team_name>Toluca F.</team_name>
-		</team>
-		<team>
-			<team_name>C. Leon</team_name>
-		</team>
-		<team>
-			<team_name>H. San Juan del Río</team_name>
-		</team>
-		<team>
-			<team_name>M. Jalpan de Serra</team_name>
-		</team>
-	</teams>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/league_mexico3-2.xml b/support_files/definitions/south_america/mexico/league_mexico3-2.xml
deleted file mode 100644
index 21d5c290..00000000
--- a/support_files/definitions/south_america/mexico/league_mexico3-2.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-	<sid>mexico3-2</sid>
-	<name>Segunda Division Zona Norte</name>
-	<short_name>2a Norte</short_name>
-	<symbol>flag_mexico.png</symbol>
-	<layer>3</layer>
-	<first_week>5</first_week>
-	<week_gap>1</week_gap>
-	<average_talent>6450</average_talent>
-	<yellow_red>3</yellow_red>
-	<round_robins>2</round_robins>
-	<names_file>latinoamerica</names_file>
-	<break>15</break>
-	
-	<teams>
-		<team>
-			<team_name>Altamira</team_name>
-		</team>
-		<team>
-			<team_name>B. Nuevo Laredo</team_name>
-		</team>
-		<team>
-			<team_name>Monterey</team_name>
-		</team>
-		<team>
-			<team_name>Durango</team_name>
-		</team>
-		<team>
-			<team_name>T. Madero</team_name>
-		</team>
-		<team>
-			<team_name>Delicias</team_name>
-		</team>
-		<team>
-			<team_name>F.C. Excelsior</team_name>
-		</team>
-		<team>
-			<team_name>Santos L.</team_name>
-		</team>
-		<team>
-			<team_name>Vaqueros A.</team_name>
-		</team>
-		<team>
-			<team_name>U.A. Tamaulipas</team_name>
-		</team>
-		<team>
-			<team_name>Cachorros U.A.N.L.</team_name>
-		</team>
-		<team>
-			<team_name>A. Lagunero</team_name>
-		</team>
-	</teams>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/league_mexico3-3.xml b/support_files/definitions/south_america/mexico/league_mexico3-3.xml
deleted file mode 100644
index 0a5edd32..00000000
--- a/support_files/definitions/south_america/mexico/league_mexico3-3.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-	<sid>mexico3-3</sid>
-	<name>Segunda Division Zona Centro</name>
-	<short_name>2a Centro</short_name>
-	<symbol>flag_mexico.png</symbol>
-	<layer>3</layer>
-	<first_week>1</first_week>
-	<week_gap>1</week_gap>
-	<average_talent>6575</average_talent>
-	<yellow_red>3</yellow_red>
-	<round_robins>2</round_robins>
-	<names_file>latinoamerica</names_file>
-	<break>11</break>
-	
-	<teams>
-		<team>
-			<team_name>P. Anahuac</team_name>
-		</team>
-		<team>
-			<team_name>Cuautitlan</team_name>
-		</team>
-		<team>
-			<team_name>Pachuca J.</team_name>
-		</team>
-		<team>
-			<team_name>R. de La Plata</team_name>
-		</team>
-		<team>
-			<team_name>U.A. de Hidalgo</team_name>
-		</team>
-		<team>
-			<team_name>P. Naucalpan</team_name>
-		</team>
-		<team>
-			<team_name>Cuautla</team_name>
-		</team>
-		<team>
-			<team_name>Mexico D.F. P.P.</team_name>
-		</team>
-		<team>
-			<team_name>A. Coapa</team_name>
-		</team>
-		<team>
-			<team_name>Tecamachalco</team_name>
-		</team>
-		<team>
-			<team_name>A. Cuernavaca</team_name>
-		</team>
-		<team>
-			<team_name>Puebla F.</team_name>
-		</team>
-		<team>
-			<team_name>U.A.E. Mexico</team_name>
-		</team>
-		<team>
-			<team_name>Pachuca T.</team_name>
-		</team>
-		<team>
-			<team_name>Zecatepel</team_name>
-		</team>
-		<team>
-			<team_name>A. Tapatio</team_name>
-		</team>
-	</teams>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/league_mexico3-4.xml b/support_files/definitions/south_america/mexico/league_mexico3-4.xml
deleted file mode 100644
index 745e3e15..00000000
--- a/support_files/definitions/south_america/mexico/league_mexico3-4.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-	<sid>mexico3-4</sid>
-	<name>Segunda Division Zona Occidente</name>
-	<short_name>2a Occidente</short_name>
-	<symbol>flag_mexico.png</symbol>
-	<layer>3</layer>
-	<first_week>3</first_week>
-	<week_gap>1</week_gap>
-	<average_talent>6500</average_talent>
-	<yellow_red>3</yellow_red>
-	<round_robins>2</round_robins>
-	<names_file>latinoamerica</names_file>
-	<break>13</break>
-	
-	<teams>
-		<team>
-			<team_name>F.S. Manzanillo</team_name>
-		</team>
-		<team>
-			<team_name>Autlan</team_name>
-		</team>
-		<team>
-			<team_name>Tecoman</team_name>
-		</team>
-		<team>
-			<team_name>J. de Zamora</team_name>
-		</team>
-		<team>
-			<team_name>Hermosillo</team_name>
-		</team>
-		<team>
-			<team_name>C.U. de Guadalajara</team_name>
-		</team>
-		<team>
-			<team_name>V. de Ixtlan</team_name>
-		</team>
-		<team>
-			<team_name>R. La Piedad</team_name>
-		</team>
-		<team>
-			<team_name>C.F.A. Guadalajara F.</team_name>
-		</team>
-		<team>
-			<team_name>Delfines F.C.</team_name>
-		</team>
-		<team>
-			<team_name>Morelia</team_name>
-		</team>
-		<team>
-			<team_name>C.D. Guadalajara F.</team_name>
-		</team>
-		<team>
-			<team_name>Jersy Nay</team_name>
-		</team>
-		<team>
-			<team_name>Zapotlanejo</team_name>
-		</team>
-	</teams>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/mexico/league_mexico3-5.xml b/support_files/definitions/south_america/mexico/league_mexico3-5.xml
deleted file mode 100644
index ef000391..00000000
--- a/support_files/definitions/south_america/mexico/league_mexico3-5.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-	<sid>mexico3-5</sid>
-	<name>Segunda Division Zona Sur</name>
-	<short_name>2a Sur</short_name>
-	<symbol>flag_mexico.png</symbol>
-	<layer>3</layer>
-	<first_week>5</first_week>
-	<week_gap>1</week_gap>
-	<average_talent>6400</average_talent>
-	<yellow_red>3</yellow_red>
-	<round_robins>2</round_robins>
-	<names_file>latinoamerica</names_file>
-	<break>15</break>
-	
-	<teams>
-		<team>
-			<team_name>Coatzacoalcos</team_name>
-		</team>
-		<team>
-			<team_name>Inter Playa del C.</team_name>
-		</team>
-		<team>
-			<team_name>J. Tabasco</team_name>
-		</team>
-		<team>
-			<team_name>Orizaba</team_name>
-		</team>
-		<team>
-			<team_name>Ocelotes U.N.A.Ch.</team_name>
-		</team>
-		<team>
-			<team_name>Cordoba</team_name>
-		</team>
-		<team>
-			<team_name>F.C. Itzaes</team_name>
-		</team>
-		<team>
-			<team_name>U. del Golfo</team_name>
-		</team>
-		<team>
-			<team_name>T.B. de Xalapa</team_name>
-		</team>
-		<team>
-			<team_name>L. Rio Grande</team_name>
-		</team>
-		<team>
-			<team_name>P. Cancun</team_name>
-		</team>
-	</teams>
\ No newline at end of file
diff --git a/support_files/definitions/south_america/peru/cup_cable_magico.xml b/support_files/definitions/south_america/peru/cup_cable_magico.xml
index 6f093ae4..7721350e 100644
--- a/support_files/definitions/south_america/peru/cup_cable_magico.xml
+++ b/support_files/definitions/south_america/peru/cup_cable_magico.xml
@@ -5,7 +5,7 @@
 	<symbol>flag_peru.png</symbol>
 	<sid>cable_magico</sid>
 	<add_week>47</add_week>
-	<last_week>50</last_week>
+	<last_week>48</last_week>
 	<week_gap>1</week_gap>
 	<property>national</property>
 	<property>silent_on_fixture_error</property>