diff --git a/Entity/Role.php b/Entity/Role.php
index c50665b11..c917dffda 100644
--- a/Entity/Role.php
+++ b/Entity/Role.php
@@ -94,7 +94,7 @@ class Role
      *
      * @return Role
      */
-    public function setType(\Chill\EventBundle\Entity\EventType $type = null)
+    public function setType(EventType $type = null)
     {
         $this->type = $type;
 
diff --git a/Form/EventType.php b/Form/EventType.php
index 6e60b5199..50e05ae80 100644
--- a/Form/EventType.php
+++ b/Form/EventType.php
@@ -30,8 +30,6 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Form\Type\ChillDateTimeType;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -42,7 +40,7 @@ use Symfony\Component\Security\Core\Role\Role;
 class EventType extends AbstractType
 {
         
-    /** @var the user running this form */
+    /** @var User */
     protected $user;
 
     /** @var AuthorizationHelper  */