diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/UIUpdateJob.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/UIUpdateJob.java
index 85c0b07..d19d23f 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/UIUpdateJob.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/UIUpdateJob.java
@@ -44,8 +44,7 @@
 	 *            the markers view base class
 	 */
 	public UIUpdateJob(ExtendedMarkersView view) {
-		super(view.getSite().getShell().getDisplay(),
-				MarkerMessages.MarkerView_19);
+		super(view.getSite().getShell().getDisplay(), MarkerMessages.MarkerView_19);
 		this.view = view;
 		updating = false;
 	}
@@ -63,16 +62,12 @@
 		Markers clone = view.getActiveViewerInputClone();
 		try {
 			updating = true;
-			monitor.beginTask(MarkerMessages.MarkerView_19,
-					IProgressMonitor.UNKNOWN);
+			monitor.beginTask(MarkerMessages.MarkerView_19, IProgressMonitor.UNKNOWN);
 
 			if (monitor.isCanceled()) {
 				return Status.CANCEL_STATUS;
 			}
 
-			//view.indicateUpdating(MarkerMessages.MarkerView_19,
-			//		true);
-
 			// If there is only one category and the user has no saved state
 			// show it
 			if (view.getBuilder().isShowingHierarchy()
@@ -122,7 +117,6 @@
 			if (view.isVisible()) {
 				viewer.getTree().setRedraw(true);
 				view.updateStatusLine(viewer.getStructuredSelection());
-//				view.updateCategoryLabels();
 			}
 			updating = false;
 		}
