--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/CollectionView.java	Sun Apr 28 15:38:01 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/CollectionView.java	Sun Apr 28 15:55:52 2013 +0200
@@ -52,8 +52,6 @@
 import org.dive4elements.river.client.client.services.LoadArtifactService;
 import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
 
-import org.dive4elements.river.client.client.ui.ScreenLock;
-
 import org.dive4elements.river.client.shared.model.Artifact;
 import org.dive4elements.river.client.shared.model.ArtifactDescription;
 import org.dive4elements.river.client.shared.model.Collection;

--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageWidget.java	Sun Apr 28 15:38:01 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageWidget.java	Sun Apr 28 15:55:52 2013 +0200
@@ -9,30 +9,45 @@
 package org.dive4elements.river.client.client.ui;
 
 import com.google.gwt.core.client.GWT;
+
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
 import com.smartgwt.client.types.SelectionStyle;
 import com.smartgwt.client.types.TreeModelType;
+
 import com.smartgwt.client.util.SC;
+
 import com.smartgwt.client.widgets.Button;
+
 import com.smartgwt.client.widgets.events.ClickEvent;
 import com.smartgwt.client.widgets.events.ClickHandler;
+
 import com.smartgwt.client.widgets.grid.HoverCustomizer;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
+
 import com.smartgwt.client.widgets.grid.events.RecordDoubleClickEvent;
 import com.smartgwt.client.widgets.grid.events.RecordDoubleClickHandler;
+
 import com.smartgwt.client.widgets.layout.VLayout;
+
 import com.smartgwt.client.widgets.tree.Tree;
 import com.smartgwt.client.widgets.tree.TreeGrid;
 import com.smartgwt.client.widgets.tree.TreeNode;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.MissingResourceException;
+import java.util.Stack;
+
 import org.dive4elements.river.client.client.Config;
 import org.dive4elements.river.client.client.FLYSConstants;
+
 import org.dive4elements.river.client.client.event.DatacageDoubleClickHandler;
 import org.dive4elements.river.client.client.event.DatacageHandler;
+
 import org.dive4elements.river.client.client.services.MetaDataService;
 import org.dive4elements.river.client.client.services.MetaDataServiceAsync;
-import org.dive4elements.river.client.client.ui.ScreenLock;
+
 import org.dive4elements.river.client.shared.model.Artifact;
 import org.dive4elements.river.client.shared.model.AttrList;
 import org.dive4elements.river.client.shared.model.DataCageNode;
@@ -40,11 +55,6 @@
 import org.dive4elements.river.client.shared.model.ToLoad;
 import org.dive4elements.river.client.shared.model.User;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.Stack;
-
 // TODO: refactor, extract ~DataCageGrid
 /**
  * Display tree of, for example, previous calculations and allows

--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinnerChangeListener.java	Sun Apr 28 15:38:01 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinnerChangeListener.java	Sun Apr 28 15:55:52 2013 +0200
@@ -8,8 +8,6 @@
 
 package org.dive4elements.river.client.client.widgets;
 
-import org.dive4elements.river.client.client.widgets.KMSpinner;
-
 import org.dive4elements.river.client.shared.model.FacetRecord;
 
 public interface KMSpinnerChangeListener {

--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/BaseServletContextListener.java	Sun Apr 28 15:38:01 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/BaseServletContextListener.java	Sun Apr 28 15:55:52 2013 +0200
@@ -16,7 +16,6 @@
 
 import org.apache.log4j.Logger;
 
-import org.dive4elements.river.client.server.LoggingConfigurator;
 import org.dive4elements.river.client.server.features.Features;
 import org.dive4elements.river.client.server.features.XMLFileFeatures;