diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/SelfVet/SelfVetConsumeController.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/SelfVet/SelfVetConsumeController.php
index 9ddcc21d9..32d68b78b 100644
--- a/src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/SelfVet/SelfVetConsumeController.php
+++ b/src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/SelfVet/SelfVetConsumeController.php
@@ -41,7 +41,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - Controllers are prone to higher coupling. This one is no exception
- * TODO: Split up into smaller controllers
  */
 class SelfVetConsumeController extends AbstractController
 {
diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/config/services.yaml b/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/config/services.yaml
index f0891b2c4..21340f927 100644
--- a/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/config/services.yaml
+++ b/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/config/services.yaml
@@ -19,22 +19,6 @@ services:
 
     Surfnet\StepupSelfService\SelfServiceBundle\Service\ControllerCheckerService:
 
-    #    Surfnet\StepupSelfService\SelfServiceBundle\Controller\SelfVetController:
-#        arguments:
-#            - "@self_service.test_second_factor_authentication_request_factory"
-#            - "@surfnet_stepup_self_service_self_service.service.second_factor"
-#            - "@surfnet_stepup.service.second_factor_type"
-#            - "@self_service.service.self_vet_marshaller"
-#            - '@Surfnet\StepupSelfService\SelfServiceBundle\Service\AuthorizationService'
-#            - "@surfnet_saml.hosted.service_provider"
-#            - "@self_service.second_factor_test_idp"
-#            - "@surfnet_saml.http.redirect_binding"
-#            - "@surfnet_saml.http.post_binding"
-#            - "@surfnet_stepup.service.loa_resolution"
-#            - "@surfnet_saml.logger"
-#            - "@request_stack"
-#            - "@logger"
-
     Surfnet\StepupSelfService\SelfServiceBundle\Controller\RecoveryTokenController:
         arguments:
             - '@Surfnet\StepupSelfService\SelfServiceBundle\Service\SelfAssertedTokens\RecoveryTokenService'