diff --git a/scm-core/src/main/java/sonia/scm/group/GroupManagerDecorator.java b/scm-core/src/main/java/sonia/scm/group/GroupManagerDecorator.java
index 40a056ab2a..3c3a9b3d27 100644
--- a/scm-core/src/main/java/sonia/scm/group/GroupManagerDecorator.java
+++ b/scm-core/src/main/java/sonia/scm/group/GroupManagerDecorator.java
@@ -34,7 +34,6 @@ package sonia.scm.group;
 //~--- non-JDK imports --------------------------------------------------------
 
 import sonia.scm.ManagerDecorator;
-import sonia.scm.plugin.ExtensionPoint;
 import sonia.scm.search.SearchRequest;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -47,7 +46,6 @@ import java.util.Collection;
  * @author Sebastian Sdorra
  * @since 1.23
  */
-@ExtensionPoint
 public class GroupManagerDecorator
   extends ManagerDecorator<Group, GroupException> implements GroupManager
 {
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
index 42c3a3555a..1ad384f4da 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManagerDecorator.java
@@ -35,7 +35,6 @@ package sonia.scm.repository;
 
 import sonia.scm.ManagerDecorator;
 import sonia.scm.Type;
-import sonia.scm.plugin.ExtensionPoint;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -51,7 +50,6 @@ import javax.servlet.http.HttpServletRequest;
  * @author Sebastian Sdorra
  * @since 1.23
  */
-@ExtensionPoint
 public class RepositoryManagerDecorator
   extends ManagerDecorator<Repository, RepositoryException>
   implements RepositoryManager
diff --git a/scm-core/src/main/java/sonia/scm/user/UserManagerDecorator.java b/scm-core/src/main/java/sonia/scm/user/UserManagerDecorator.java
index 7f7b26be2a..e2006f0dff 100644
--- a/scm-core/src/main/java/sonia/scm/user/UserManagerDecorator.java
+++ b/scm-core/src/main/java/sonia/scm/user/UserManagerDecorator.java
@@ -34,7 +34,6 @@ package sonia.scm.user;
 //~--- non-JDK imports --------------------------------------------------------
 
 import sonia.scm.ManagerDecorator;
-import sonia.scm.plugin.ExtensionPoint;
 import sonia.scm.search.SearchRequest;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -47,7 +46,6 @@ import java.util.Collection;
  * @author Sebastian Sdorra
  * @since 1.23
  */
-@ExtensionPoint
 public class UserManagerDecorator extends ManagerDecorator<User, UserException>
   implements UserManager
 {