diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
index 1ac79b37f5..65b1b9c215 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php
@@ -59,7 +59,7 @@ class Feed implements ControllerProviderInterface
                 $app->abort(404, "Feed not found");
             }
 
-            $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findByUser($feed, $app['authentication']->getUser());
+            $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findOneBy(array('feed' => $feed, 'usr_id' => $app['authentication']->getUser()->get_id()));
 
             if ('' === $title = trim($request->request->get('title', ''))) {
                 $app->abort(400, "Bad request");
diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php
index e536aa8d0a..a2b863a581 100644
--- a/lib/Alchemy/Phrasea/Feed/Aggregate.php
+++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php
@@ -77,7 +77,7 @@ class Aggregate implements FeedInterface
     public static function createFromUser(EntityManager $em, \User_Adapter $user)
     {
         $feeds = $em->getRepository('Entities\Feed')->getAllForUser($user);
-        $token = $em->getRepository('Entities\AggregateToken')->findByUser($user);
+        $token = $em->getRepository('Entities\AggregateToken')->findOneBy(array('usr_id' => $user->get_id()));
 
         return new static($em, $feeds, $token);
     }
diff --git a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
index 7fb9d562a3..30cc30b3a9 100644
--- a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
+++ b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
@@ -123,7 +123,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface
     {
         $token = $this->em
             ->getRepository('Entities\AggregateToken')
-            ->findByUser($user);
+            ->findOneBy(array('usr_id' => $user->get_id()));
 
         if (null === $token || true === $renew) {
             if (null === $token) {
diff --git a/lib/Doctrine/Repositories/AggregateTokenRepository.php b/lib/Doctrine/Repositories/AggregateTokenRepository.php
index 7e104f3a42..ec72a2544f 100644
--- a/lib/Doctrine/Repositories/AggregateTokenRepository.php
+++ b/lib/Doctrine/Repositories/AggregateTokenRepository.php
@@ -12,7 +12,6 @@
 namespace Repositories;
 
 use Doctrine\ORM\EntityRepository;
-use Entities\AggregateToken;
 
 /**
  * AggregateTokenRepository
@@ -22,24 +21,4 @@ use Entities\AggregateToken;
  */
 class AggregateTokenRepository extends EntityRepository
 {
-    /**
-     * Finds an AggregateToken based on given User_Adapter.
-     *
-     * @param \User_Adapter $user
-     *
-     * @return AggregateToken
-     */
-    public function findByUser(\User_Adapter $user)
-    {
-        $dql = 'SELECT t
-            FROM Entities\AggregateToken t
-            WHERE t.usr_id = :usr_id';
-
-        $query = $this->_em->createQuery($dql);
-        $query->setParameters(array(
-            ':usr_id' => $user->get_id())
-        );
-
-        return $query->getOneOrNullResult();
-    }
 }
diff --git a/lib/Doctrine/Repositories/FeedTokenRepository.php b/lib/Doctrine/Repositories/FeedTokenRepository.php
index f3b3df1630..8ef8e64a01 100644
--- a/lib/Doctrine/Repositories/FeedTokenRepository.php
+++ b/lib/Doctrine/Repositories/FeedTokenRepository.php
@@ -12,8 +12,6 @@
 namespace Repositories;
 
 use Doctrine\ORM\EntityRepository;
-use Entities\Feed;
-use Entities\FeedToken;
 
 /**
  * FeedTokenRepository
diff --git a/lib/Doctrine/Repositories/OrderElementRepository.php b/lib/Doctrine/Repositories/OrderElementRepository.php
index 6f10930516..67c86325b8 100644
--- a/lib/Doctrine/Repositories/OrderElementRepository.php
+++ b/lib/Doctrine/Repositories/OrderElementRepository.php
@@ -12,8 +12,6 @@
 namespace Repositories;
 
 use Doctrine\ORM\EntityRepository;
-use Entities\Feed;
-use Entities\FeedPublisher;
 
 /**
  * OrderElementRepository
@@ -23,23 +21,4 @@ use Entities\FeedPublisher;
  */
 class OrderElementRepository extends EntityRepository
 {
-    /**
-     * Finds a FeedPublisher based on a given Feed and a User_Adapter.
-     *
-     * @param Feed          $feed
-     * @param \User_Adapter $user
-     *
-     * @return FeedPublisher
-     */
-    public function findByUser(Feed $feed, \User_Adapter $user)
-    {
-        $dql = 'SELECT f FROM Entities\FeedPublisher f
-                WHERE f.usr_id = :usrId AND f.feed = :feed';
-
-        $query = $this->_em->createQuery($dql);
-        $query->setParameter('usrId', $user->get_id());
-        $query->setParameter('feed', $feed);
-
-        return $query->getOneOrNullResult();
-    }
 }
diff --git a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
index 8d58c0d815..ead1fd04e0 100644
--- a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
@@ -100,7 +100,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
         }
         $token = self::$DI['app']['EM']
             ->getRepository('Entities\AggregateToken')
-            ->findByUser($user);
+            ->findOneBy(array('usr_id' => $user->get_id()));
         self::$DI['app']['EM']->remove($token);
         self::$DI['app']['EM']->flush();
     }