--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/02/02 18:47:55	581
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/02/02 19:05:08	582
@@ -197,8 +197,6 @@
 
 
 		    	String trainNumber = fields.get(1).asText();
-		    	if (type.equalsIgnoreCase("S2")) //If it is S-train we need to extract the trainNumber 
-		    		trainNumber = trainNumber + " " + extractTrainNumber(fields.get(2));
 		    	departure.setTrainNumber(trainNumber);
 
 		    	String destination = fields.get(2).asText();
@@ -210,7 +208,7 @@
 		    	String status = fields.get(4).asText();
 		    	departure.setStatus(status);
 
-		    	String note = extractNote( fields.get(5) );
+		    	String note = fields.get(5).asText();
 		    	departure.setNote(note);
 
 		    	departureList.add(departure);