diff --git a/Controller/CaptchaController.php b/Controller/CaptchaController.php
index d3c5751..5b20ec5 100644
--- a/Controller/CaptchaController.php
+++ b/Controller/CaptchaController.php
@@ -5,7 +5,6 @@
 namespace Gregwar\CaptchaBundle\Controller;
 
 use Gregwar\CaptchaBundle\Generator\CaptchaGenerator;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -14,7 +13,7 @@
  *
  * @author Jeremy Livingston <jeremy.j.livingston@gmail.com>
  */
-class CaptchaController extends AbstractController
+class CaptchaController
 {
     /** @var CaptchaGenerator */
     private $captchaGenerator;
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index ec7e76f..fabbcfe 100755
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -8,20 +8,17 @@ parameters:
     
 services:
     Gregwar\CaptchaBundle\Controller\CaptchaController:
-        public: true
-        alias: 'gregwar_captcha.controller'
-
-    gregwar_captcha.controller:
         class: '%gregwar_captcha.controller.class%'
         public: true
         arguments:
             - '@gregwar_captcha.generator'
             - '%gregwar_captcha.config%'
+        tags:
+            - controller.service_arguments
 
 #    captcha.type:
     gregwar_captcha.type:
         class: '%gregwar_captcha.captcha_type.class%'
-        public: true
         arguments:
             - '@session'
             - '@gregwar_captcha.generator'
@@ -32,7 +29,6 @@ services:
 
     gregwar_captcha.generator:
         class: '%gregwar_captcha.captcha_generator.class%'
-        public: true
         arguments:
             - '@router'
             - '@gregwar_captcha.captcha_builder'
@@ -41,7 +37,6 @@ services:
 
     gregwar_captcha.image_file_handler:
         class: '%gregwar_captcha.image_file_handler.class%'
-        public: true
         arguments:
             - '%gregwar_captcha.config.image_folder%'
             - '%gregwar_captcha.config.web_path%'
@@ -50,8 +45,6 @@ services:
 
     gregwar_captcha.captcha_builder:
         class: '%gregwar_captcha.captcha_builder.class%'
-        public: true
 
     gregwar_captcha.phrase_builder:
         class: '%gregwar_captcha.phrase_builder.class%'
-        public: true