diff --git a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java
index 7d871ca631..b5d20aad53 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java
@@ -24,8 +24,6 @@
 
 package sonia.scm.store;
 
-//~--- non-JDK imports --------------------------------------------------------
-
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Maps;
 import org.slf4j.Logger;
@@ -45,32 +43,13 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Predicate;
 
-//~--- JDK imports ------------------------------------------------------------
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 
-/**
- * @param <V>
- * @author Sebastian Sdorra
- */
 public class JAXBConfigurationEntryStore<V> implements ConfigurationEntryStore<V> {
 
-  /**
-   * Field description
-   */
   private static final String TAG_CONFIGURATION = "configuration";
-
-  /**
-   * Field description
-   */
   private static final String TAG_ENTRY = "entry";
-
-  /**
-   * Field description
-   */
   private static final String TAG_KEY = "key";
-
-  /**
-   * Field description
-   */
   private static final String TAG_VALUE = "value";
 
   /**
@@ -191,7 +170,7 @@ public class JAXBConfigurationEntryStore<V> implements ConfigurationEntryStore<V
           }
 
           // closed or new entry tag
-          if (reader.nextTag() == XMLStreamReader.END_ELEMENT) {
+          if (reader.nextTag() == END_ELEMENT) {
 
             // fixed format, start new entry
             reader.nextTag();
@@ -203,9 +182,6 @@ public class JAXBConfigurationEntryStore<V> implements ConfigurationEntryStore<V
     });
   }
 
-  /**
-   * Method description
-   */
   private void store() {
     LOG.debug("store configuration to {}", file);
 
diff --git a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationStore.java b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationStore.java
index b5b4ff4034..6b2cf9993a 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationStore.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationStore.java
@@ -24,18 +24,11 @@
 
 package sonia.scm.store;
 
-//~--- non-JDK imports --------------------------------------------------------
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-//~--- JDK imports ------------------------------------------------------------
 import java.io.File;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-
 /**
  * JAXB implementation of {@link ConfigurationStore}.
  *
diff --git a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java
index 4ab83ca961..2fbadadf45 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBDataStore.java
@@ -24,24 +24,15 @@
 
 package sonia.scm.store;
 
-//~--- non-JDK imports --------------------------------------------------------
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sonia.scm.security.KeyGenerator;
 
-//~--- JDK imports ------------------------------------------------------------
 import java.io.File;
-
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-
 /**
  * Jaxb implementation of {@link DataStore}.
  *