diff --git a/scm-core/src/main/java/sonia/scm/repository/BlameLine.java b/scm-core/src/main/java/sonia/scm/repository/BlameLine.java
index 9988287b87..7d60e6e9f6 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BlameLine.java
+++ b/scm-core/src/main/java/sonia/scm/repository/BlameLine.java
@@ -43,7 +43,7 @@ import com.google.common.base.Objects;
  * @author Sebastian Sdorra
  * @since 1.8
  */
-public class BlameLine implements Cloneable
+public class BlameLine
 {
 
   /**
@@ -77,31 +77,6 @@ public class BlameLine implements Cloneable
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Create a clone of this {@link BlameLine} object.
-   *
-   *
-   * @return clone of this {@link BlameLine}
-   *
-   * @since 1.17
-   */
-  @Override
-  public BlameLine clone()
-  {
-    BlameLine blameLine = null;
-
-    try
-    {
-      blameLine = (BlameLine) super.clone();
-    }
-    catch (CloneNotSupportedException ex)
-    {
-      throw new RuntimeException(ex);
-    }
-
-    return blameLine;
-  }
-
   /**
    * {@inheritDoc}
    *
diff --git a/scm-core/src/main/java/sonia/scm/repository/BlameResult.java b/scm-core/src/main/java/sonia/scm/repository/BlameResult.java
index d4581dae84..9a9e59b631 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BlameResult.java
+++ b/scm-core/src/main/java/sonia/scm/repository/BlameResult.java
@@ -57,7 +57,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlRootElement(name = "blame-result")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class BlameResult implements Cloneable
+public class BlameResult
 {
 
   /**
@@ -93,31 +93,6 @@ public class BlameResult implements Cloneable
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Create a clone of this {@link BlameResult} object.
-   *
-   *
-   * @return clone of this {@link BlameResult}
-   *
-   * @since 1.17
-   */
-  @Override
-  public BlameResult clone()
-  {
-    BlameResult blameResult = null;
-
-    try
-    {
-      blameResult = (BlameResult) super.clone();
-    }
-    catch (CloneNotSupportedException ex)
-    {
-      throw new RuntimeException(ex);
-    }
-
-    return blameResult;
-  }
-
   /**
    * {@inheritDoc}
    *
diff --git a/scm-core/src/main/java/sonia/scm/repository/BrowserResult.java b/scm-core/src/main/java/sonia/scm/repository/BrowserResult.java
index dbcf1cf91f..7230b2ab48 100644
--- a/scm-core/src/main/java/sonia/scm/repository/BrowserResult.java
+++ b/scm-core/src/main/java/sonia/scm/repository/BrowserResult.java
@@ -55,7 +55,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement(name = "browser-result")
-public class BrowserResult implements Iterable<FileObject>, Cloneable
+public class BrowserResult implements Iterable<FileObject>
 {
 
   /**
@@ -84,31 +84,6 @@ public class BrowserResult implements Iterable<FileObject>, Cloneable
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Create a clone of this {@link BrowserResult} object.
-   *
-   *
-   * @return clone of this {@link BrowserResult}
-   *
-   * @since 1.17
-   */
-  @Override
-  public BrowserResult clone()
-  {
-    BrowserResult browserResult = null;
-
-    try
-    {
-      browserResult = (BrowserResult) super.clone();
-    }
-    catch (CloneNotSupportedException ex)
-    {
-      throw new RuntimeException(ex);
-    }
-
-    return browserResult;
-  }
-
   /**
    * {@inheritDoc}
    *
diff --git a/scm-core/src/main/java/sonia/scm/repository/Changeset.java b/scm-core/src/main/java/sonia/scm/repository/Changeset.java
index 20eadd1ac3..379582c8c8 100644
--- a/scm-core/src/main/java/sonia/scm/repository/Changeset.java
+++ b/scm-core/src/main/java/sonia/scm/repository/Changeset.java
@@ -62,7 +62,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(name = "changeset")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Changeset extends BasicPropertiesAware
-        implements Validateable, Cloneable, Serializable
+        implements Validateable, Serializable
 {
 
   /** Field description */
@@ -108,31 +108,6 @@ public class Changeset extends BasicPropertiesAware
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Create a clone of this {@link Changeset} object.
-   *
-   *
-   * @return clone of this {@link Changeset}
-   *
-   * @since 1.17
-   */
-  @Override
-  public Changeset clone()
-  {
-    Changeset changeset = null;
-
-    try
-    {
-      changeset = (Changeset) super.clone();
-    }
-    catch (CloneNotSupportedException ex)
-    {
-      throw new RuntimeException(ex);
-    }
-
-    return changeset;
-  }
-
   /**
    * {@inheritDoc}
    *
diff --git a/scm-core/src/main/java/sonia/scm/repository/ChangesetPagingResult.java b/scm-core/src/main/java/sonia/scm/repository/ChangesetPagingResult.java
index 15096e792f..d4a105d22b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/ChangesetPagingResult.java
+++ b/scm-core/src/main/java/sonia/scm/repository/ChangesetPagingResult.java
@@ -50,7 +50,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlRootElement(name = "changeset-paging")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ChangesetPagingResult implements Iterable<Changeset>, Cloneable
+public class ChangesetPagingResult implements Iterable<Changeset>
 {
 
   /**
@@ -74,31 +74,6 @@ public class ChangesetPagingResult implements Iterable<Changeset>, Cloneable
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Create a clone of this {@link ChangesetPagingResult} object.
-   *
-   *
-   * @return clone of this {@link ChangesetPagingResult}
-   *
-   * @since 1.17
-   */
-  @Override
-  public ChangesetPagingResult clone()
-  {
-    ChangesetPagingResult changesetPagingResult = null;
-
-    try
-    {
-      changesetPagingResult = (ChangesetPagingResult) super.clone();
-    }
-    catch (CloneNotSupportedException ex)
-    {
-      throw new RuntimeException(ex);
-    }
-
-    return changesetPagingResult;
-  }
-
   /**
    * Method description
    *
diff --git a/scm-core/src/main/java/sonia/scm/repository/FileObject.java b/scm-core/src/main/java/sonia/scm/repository/FileObject.java
index 27c03d22c9..089ac48361 100644
--- a/scm-core/src/main/java/sonia/scm/repository/FileObject.java
+++ b/scm-core/src/main/java/sonia/scm/repository/FileObject.java
@@ -56,31 +56,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class FileObject implements LastModifiedAware
 {
 
-  /**
-   * Create a clone of this {@link FileObject} object.
-   *
-   *
-   * @return clone of this {@link FileObject}
-   *
-   * @since 1.17
-   */
-  @Override
-  public FileObject clone()
-  {
-    FileObject fileObject = null;
-
-    try
-    {
-      fileObject = (FileObject) super.clone();
-    }
-    catch (CloneNotSupportedException ex)
-    {
-      throw new RuntimeException(ex);
-    }
-
-    return fileObject;
-  }
-
   /**
    * {@inheritDoc}
    *
diff --git a/scm-core/src/main/java/sonia/scm/repository/Modifications.java b/scm-core/src/main/java/sonia/scm/repository/Modifications.java
index 33571b28d2..5ce5779031 100644
--- a/scm-core/src/main/java/sonia/scm/repository/Modifications.java
+++ b/scm-core/src/main/java/sonia/scm/repository/Modifications.java
@@ -58,7 +58,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement(name = "modifications")
-public class Modifications implements Cloneable, Serializable
+public class Modifications implements Serializable
 {
 
   /** Field description */
@@ -113,31 +113,6 @@ public class Modifications implements Cloneable, Serializable
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Create a clone of this {@link Modifications} object.
-   *
-   *
-   * @return clone of this {@link Modifications}
-   *
-   * @since 1.17
-   */
-  @Override
-  public Modifications clone()
-  {
-    Modifications modifications = null;
-
-    try
-    {
-      modifications = (Modifications) super.clone();
-    }
-    catch (CloneNotSupportedException ex)
-    {
-      throw new RuntimeException(ex);
-    }
-
-    return modifications;
-  }
-
   /**
    * {@inheritDoc}
    *
diff --git a/scm-core/src/main/java/sonia/scm/repository/Person.java b/scm-core/src/main/java/sonia/scm/repository/Person.java
index 74f44317c9..29ea5b3d5b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/Person.java
+++ b/scm-core/src/main/java/sonia/scm/repository/Person.java
@@ -56,7 +56,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlRootElement(name = "person")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class Person implements Validateable, Serializable, Cloneable
+public class Person implements Validateable, Serializable
 {
 
   /** Field description */
@@ -130,31 +130,6 @@ public class Person implements Validateable, Serializable, Cloneable
     return person;
   }
 
-  /**
-   * Create a clone of this {@link Person} object.
-   *
-   *
-   * @return clone of this {@link Person}
-   *
-   * @since 1.17
-   */
-  @Override
-  public Person clone()
-  {
-    Person person = null;
-
-    try
-    {
-      person = (Person) super.clone();
-    }
-    catch (CloneNotSupportedException ex)
-    {
-      throw new RuntimeException(ex);
-    }
-
-    return person;
-  }
-
   /**
    * {@inheritDoc}
    *
diff --git a/scm-core/src/main/java/sonia/scm/repository/SubRepository.java b/scm-core/src/main/java/sonia/scm/repository/SubRepository.java
index 572a92dd05..de80720815 100644
--- a/scm-core/src/main/java/sonia/scm/repository/SubRepository.java
+++ b/scm-core/src/main/java/sonia/scm/repository/SubRepository.java
@@ -50,7 +50,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  */
 @XmlRootElement(name = "subrepository")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SubRepository implements Cloneable
+public class SubRepository
 {
 
   /**
@@ -99,32 +99,7 @@ public class SubRepository implements Cloneable
   }
 
   //~--- methods --------------------------------------------------------------
-
-  /**
-   * Create a clone of this {@link SubRepository} object.
-   *
-   *
-   * @return clone of this {@link SubRepository}
-   *
-   * @since 1.17
-   */
-  @Override
-  public SubRepository clone()
-  {
-    SubRepository subRepository = null;
-
-    try
-    {
-      subRepository = (SubRepository) super.clone();
-    }
-    catch (CloneNotSupportedException ex)
-    {
-      throw new RuntimeException(ex);
-    }
-
-    return subRepository;
-  }
-
+  
   /**
    * {@inheritDoc}
    *