diff --git a/www/parser.php b/www/parser.php
deleted file mode 100644
index 4393f95..0000000
--- a/www/parser.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-//Data from TRBOS-FMS http://www.lfs-bw.de/Fachthemen/Digitalfunk-Funk/Documents/Pruefstelle/TRBOS-FMS.pdf
-
-	function parse($mode, $data)
-	{	
-		//Data for Service Parsing
-		$service = array(
-		"0" => "Unbekannt",
-		"1" => "Polizei",
-		"2" => "Bundesgrenzschutz",
-		"3" => "Bundeskriminalamt",
-		"4" => "Katastrophenschutz",
-		"5" => "Zoll",
-		"6" => "Feuerwehr",
-		"7" => "Technisches Hilfswerk",
-		"8" => "Arbeiter-Samariter-Bund",
-		"9" => "Deutsches Rotes Kreuz",
-		"a" => "Johanniter-Unfall-Hilfe",
-		"b" => "Malteser-Hilfsdienst",
-		"c" => "Deutsche Lebensrettungsgesellschaft",
-		"d" => "Rettungsdienst",
-		"e" => "Zivilschutz",
-		"f" => "Fernwirktelegramm",
-	);
-
-	//Data for Country Parsing
-	$country = array(
-		"0" => "Sachsen",
-		"1" => "Bund",
-		"2" => "Baden-Württemberg",
-		"3" => "Bayern I",
-		"4" => "Berlin",
-		"5" => "Bremen",
-		"6" => "Hamburg",
-		"7" => "Hessen",
-		"8" => "Niedersachsen",
-		"9" => "Nordrhein-Westfalen",
-		"a" => "Rheinland-Pflaz",
-		"b" => "Schleswig-Holstein",
-		"c" => "Saarland",
-		"d" => "Bayern II",
-		"e" => "Meck-Pom/Sachsen-Anhalt",
-		"f" => "Brandenburg/Thüringen",
-	);
-	
-	//Data for Location Parsing
-	$location = array(
-		"11" => "testLoc",
-		"22" => "testLoc",
-		"33" => "testLoc"
-	);
-	
-	//Data for Vehicle Parsing
-	$vehicle = array(
-		"1111" => "testVeh",
-		"2222" => "testVeh",
-		"3333" => "testVeh"
-	);
-	
-	
-	//Data for ZVEI Parsing
-	$zvei = array(
-		"12345" => "testZvei",
-		"23456" => "testZvei",
-		"34567" => "testZvei",
-	);
-
-	
-		switch ($mode) {
-			//Parse Service
-			case "service":
-				$data = substr($data,0,1);
-				if (array_key_exists($data, $service))
-				{
-					return $service[$data];
-				}else
-				{
-					return $data;
-				}
-				break;
-			
-			//Parse Country
-			case "country":
-				$data = substr($data,1,1);
-				if (array_key_exists($data, $country))
-				{
-					return $country[$data];
-				}else
-				{
-					return $data;
-				}
-				break;
-				
-			//Parse Location
-			case "location":
-				$data = substr($data,2,2);
-				if (array_key_exists($data, $location))
-				{
-					return $location[$data];
-				}else
-				{
-					return $data;
-				}
-				break;
-				
-			//Parse Vehicle
-			case "vehicle":
-				$data = substr($data,4,4);
-				if (array_key_exists($data, $vehicle))
-				{
-					return $vehicle[$data];
-				}else
-				{
-					return $data;
-				}
-				break;
-			
-			//Parse direction
-			case "direction":
-				if (substr($data,9,1) == 1)
-				{
-					return "L->F";
-				}elseif (substr($data,9,1) == 0)
-				{
-					return "F->L";
-				}else
-				{
-					return "ERR!";
-				}
-				break;
-	
-			//Parse Zvei
-			case "zvei":
-				if (array_key_exists($data, $zvei))
-				{
-					return $data ." - ". $zvei[$data];
-				}else
-				{
-					return $data;
-				}
-				break;
-
-			default:
-				return "Parser: mode error!";
-		}
-	}
-
-?>
\ No newline at end of file
diff --git a/www/template.overview.php b/www/template.overview.php
index ca9287c..e1c973a 100644
--- a/www/template.overview.php
+++ b/www/template.overview.php
@@ -6,10 +6,7 @@ Last alarms for FMS and ZVEI (max. 50)<br><br>
 		<tr style="font-weight: bold;">
 			<td>ID</td>
 			<td>Datum - Zeit</td>
-			<td>BOS</td>
-			<td>Bundesland</td>
-			<td>Ort</td>
-			<td>Fahrzeug</td>
+			<td>FMS</td>
 			<td>Stat.</td>
 			<td>Richt.</td>
 			<td>TKI</td>
@@ -21,16 +18,12 @@ Last alarms for FMS and ZVEI (max. 50)<br><br>
 			$time = strtotime($fms['time']);
 			$time = date("d.m.Y H:i:s", $time);
 		
-			$fms_id = $fms['service'].$fms['country'].$fms['location'].$fms['vehicle'].$fms['status'].$fms['direction'];
 			echo "<tr>";
 			echo "<td>". $fms['id'] . "</td>";
 			echo "<td>". $time . "</td>";
-			echo "<td>". parse("service",$fms_id) . "</td>";
-			echo "<td>". parse("country",$fms_id) . "</td>";
-			echo "<td>". parse("location",$fms_id) . "</td>";
-			echo "<td>". parse("vehicle",$fms_id) . "</td>";
+			echo "<td>". $fms['fms'] . "</td>";
 			echo "<td>". $fms['status'] . "</td>";
-			echo "<td>". parse("direction",$fms_id) . "</td>";
+			echo "<td>". $fms['direction'] . "</td>";
 			echo "<td>". $fms['tsi'] . "</td>";
 			echo "</tr>";
 		}
@@ -56,7 +49,7 @@ Last alarms for FMS and ZVEI (max. 50)<br><br>
 			echo "<tr>";
 			echo "<td>". $zvei['id'] . "</td>";
 			echo "<td>". $time . "</td>";
-			echo "<td>". parse('zvei',$zvei['zvei']) . "</td>";
+			echo "<td>". $zvei['zvei'] . "</td>";
 			echo "</tr>";
 		}
 	?>