diff --git a/CRM/Dataprocessor/Form/Output.php b/CRM/Dataprocessor/Form/Output.php
index 587657bbd107a7678d41c4de9730aae2a237c68e..121f2b143b69ff915755f5c0408a90dc464c0528 100644
--- a/CRM/Dataprocessor/Form/Output.php
+++ b/CRM/Dataprocessor/Form/Output.php
@@ -35,9 +35,6 @@ class CRM_Dataprocessor_Form_Output extends CRM_Core_Form {
     }
 
     $factory = dataprocessor_get_factory();
-    // echo "<pre>";
-    // print_r($factory);
-    // echo "</pre>";
     $this->dataProcessorId = CRM_Utils_Request::retrieve('data_processor_id', 'Integer');
     $this->assign('data_processor_id', $this->dataProcessorId);
 
diff --git a/CRM/DataprocessorSearch/Controller/ParticiapntSearch.php b/CRM/DataprocessorSearch/Controller/ParticiapntSearch.php
deleted file mode 100644
index 18713fcd558f40331fcdbbed78f0a03238506020..0000000000000000000000000000000000000000
--- a/CRM/DataprocessorSearch/Controller/ParticiapntSearch.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * @author Jaap Jansma <jaap.jansma@civicoop.org>
- * @license AGPL-3.0
- */
-
-/**
- * This class is used by the Search functionality.
- *
- *  - the search controller is used for building/processing multiform
- *    searches.
- *
- * Typically the first form will display the search criteria and it's results
- *
- * The second form is used to process search results with the associated actions.
- */
-class CRM_DataprocessorSearch_Controller_ParticipantSearch extends CRM_Core_Controller {
-
-  /**
-   * Class constructor.
-   *
-   * @param string $title
-   * @param bool $modal
-   * @param int|mixed|null $action
-   */
-  public function __construct($title = NULL, $modal = TRUE, $action = CRM_Core_Action::NONE) {
-    parent::__construct($title, $modal);
-
-    $this->_stateMachine = new CRM_DataprocessorSearch_StateMachine_ParticipantSearch($this, $action);
-
-    // create and instantiate the pages
-    $this->addPages($this->_stateMachine, $action);
-
-    // add all the actions
-    $this->addActions();
-  }
-
-  /**
-   * Process the request, overrides the default QFC run method
-   * This routine actually checks if the QFC is modal and if it
-   * is the first invalid page, if so it call the requested action
-   * if not, it calls the display action on the first invalid page
-   * avoids the issue of users hitting the back button and getting
-   * a broken page
-   *
-   * This run is basically a composition of the original run and the
-   * jump action
-   *
-   * @return mixed
-   */
-  public function run() {
-
-    $actionName = $this->getActionName();
-    print_r($actionName);
-    list($pageName, $action) = $actionName;
-    // Hack to replace to userContext for redirecting after a Task has been completed.
-    // We want the redirect
-    if (!$this->_pages[$pageName] instanceof CRM_DataprocessorSearch_Form_ParticipantSearch) {
-      $session = CRM_Core_Session::singleton();
-      $qfKey = CRM_Utils_Request::retrieve('qfKey', 'String', $this);
-      $urlPath = CRM_Utils_System::getUrlPath();
-      $urlParams = 'force=1';
-      if ($qfKey) {
-        $urlParams .= "&qfKey=$qfKey";
-      }
-      $this->setDestination(CRM_Utils_System::url($urlPath, $urlParams));
-    }
-
-    return parent::run();
-  }
-
-  /**
-   * @return mixed
-   */
-  public function selectorName() {
-    return $this->get('selectorName');
-  }
-
-}
diff --git a/CRM/DataprocessorSearch/Controller/ParticipantSearch.php b/CRM/DataprocessorSearch/Controller/ParticipantSearch.php
index 18713fcd558f40331fcdbbed78f0a03238506020..068b8fc141f8dd50cf4c67cd1617170b8f691bef 100644
--- a/CRM/DataprocessorSearch/Controller/ParticipantSearch.php
+++ b/CRM/DataprocessorSearch/Controller/ParticipantSearch.php
@@ -51,7 +51,6 @@ class CRM_DataprocessorSearch_Controller_ParticipantSearch extends CRM_Core_Cont
   public function run() {
 
     $actionName = $this->getActionName();
-    print_r($actionName);
     list($pageName, $action) = $actionName;
     // Hack to replace to userContext for redirecting after a Task has been completed.
     // We want the redirect