diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index 1f5e62ab76..8e6e31ed30 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,12 @@
+2013-12-04  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* src/pandroid_event_viewer/pandorafms/EventList.java,
+	src/pandroid_event_viewer/pandorafms/Main.java: fixed java
+	warnings.
+	
+	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java:
+	fixed the hack for old pandoras.
+
 2013-12-04  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* src/pandroid_event_viewer/pandorafms/About.java: removed the
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
index 805cfdbf9a..bdf8f4c5cb 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
@@ -26,7 +26,6 @@ import java.util.Date;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.ListActivity;
-import android.app.ProgressDialog;
 import android.app.TabActivity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -78,7 +77,7 @@ public class EventList extends ListActivity {
 	public PandroidEventviewerActivity object;
 	private BroadcastReceiver onBroadcast;
 	public Dialog creatingIncidentDialog;
-	private Context context = this;
+	
 	private View currentElement;
 
 	@Override
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
index 8ac3aff2f3..4294cc9360 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
@@ -52,7 +52,6 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 import android.widget.Toast;
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
index a6ef4fc567..be5f12b4e2 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
@@ -526,30 +526,9 @@ public class PandroidEventviewerActivity extends TabActivity implements
 			id_group, severity, status, eventSearch, eventTag, timestamp,
 			pagination, offset, false, false);
 		Log.d(TAG, "List of events: " + return_api);
-		Pattern pattern = Pattern
-			.compile("Unable to process XML data file '(.*)'");
-		Matcher matcher;
+		
 		String filename;
-
-		boolean endReplace = false;
-		int i22 = 0;
-		while (!endReplace) {
-			Log.i(TAG + " getEvents - loop", i22 + "");
-			i22++;
-			matcher = pattern.matcher(return_api);
-
-			if (matcher.find()) {
-				filename = matcher.group(1);
-				return_api = return_api
-					.replaceFirst(
-						"Unable to process XML data file[^\n]*\n[^\n]*line 187 thread .*\n",
-						"Bad XML: " + filename);
-			}
-			else {
-				endReplace = true;
-			}
-		}
-
+		
 		Log.i(TAG + " getEvents - return_api", return_api);
 
 		String[] lines = return_api.split("\n");