diff --git a/workflow/engine/methods/bpmn/processes_Ajax.php b/workflow/engine/methods/bpmn/processes_Ajax.php
index 098c7f789..b6764dab1 100755
--- a/workflow/engine/methods/bpmn/processes_Ajax.php
+++ b/workflow/engine/methods/bpmn/processes_Ajax.php
@@ -372,6 +372,27 @@ if ( isset ($_REQUEST['action']) ) {
                 $cont = Content::addContent( 'TAS_TITLE', '', $_POST['TAS_PARENT'], $lang, $_POST['SPROCESS_NAME'] );
             break;
 
+        case 'deleteTriggers':
+            try{
+            require_once('classes/model/Triggers.php');
+            foreach($TRI_UIDS as $i=>$TRI_UID) {
+                $oTrigger = new Triggers();
+                $triggerObj=$oTrigger->load($_POST['TRI_UID']);
+                $oTrigger->remove($_POST['TRI_UID']);
+                require_once('classes/model/StepTrigger.php');
+                $oStepTrigger = new StepTrigger();
+                $oStepTrigger->removeTrigger($_POST['TRI_UID']);
+                }
+                $result->success = true;
+                $result->message = G::LoadTranslation('ID_REPORTTABLE_REMOVED');
+                }
+                catch (Exception $e) {
+                    $result->success = false;
+                    $result->message = $e->getMessage();
+                   }
+                print G::json_encode($result);
+
+
       }
 }
 
diff --git a/workflow/engine/methods/triggers/triggers_Ajax.php b/workflow/engine/methods/triggers/triggers_Ajax.php
index 1a1a33b01..b9452bf85 100755
--- a/workflow/engine/methods/triggers/triggers_Ajax.php
+++ b/workflow/engine/methods/triggers/triggers_Ajax.php
@@ -44,8 +44,9 @@ switch($request){
       
       $oTrigger = new Triggers; 
       $oResult = $oTrigger->verifyDependecies($_POST['TRI_UID']);
-      
+      $oResult->passed = false;
       if($oResult->code == 0){
+        $oResult->passed = true;
         $oResult->message = G::LoadTranslation('ID_TRIGGERS_VALIDATION'); //"No Dependencies were found for this trigger in Events definitions\n";
       } else {
         $oResult->message = '';
@@ -63,6 +64,7 @@ switch($request){
           $oResult->message .= "\n";
         }
       }
+      $oResult->success = true;
       //print_r($oResult);
       print G::json_encode($oResult);
     break;
diff --git a/workflow/engine/methods/triggers/triggers_Delete.php b/workflow/engine/methods/triggers/triggers_Delete.php
index f7de62b71..a74f1ad60 100644
--- a/workflow/engine/methods/triggers/triggers_Delete.php
+++ b/workflow/engine/methods/triggers/triggers_Delete.php
@@ -23,8 +23,9 @@
  * 
  */
 if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Response;
-
+try{
 require_once('classes/model/Triggers.php');
+
 $oTrigger = new Triggers();
 $triggerObj=$oTrigger->load($_POST['TRI_UID']);
 
@@ -34,10 +35,14 @@ require_once('classes/model/StepTrigger.php');
 $oStepTrigger = new StepTrigger();
 $oStepTrigger->removeTrigger($_POST['TRI_UID']);
 
-G::LoadClass('processMap');
-$oProcessMap = new processMap(new DBConnection);
-//Update Trigger Array
-$oProcessMap->triggersList($triggerObj['PRO_UID']);
+$result->success = true;
+$result->msg = G::LoadTranslation('ID_REPORTTABLE_REMOVED');
 
+}
+catch (Exception $e) {
+    $result->success = false;
+    $result->msg = $e->getMessage();
+   }
+print G::json_encode($result);
 
 ?>
\ No newline at end of file
diff --git a/workflow/engine/templates/bpmn/ProcessOptions.js b/workflow/engine/templates/bpmn/ProcessOptions.js
index 743ba5b0e..606f481b9 100755
--- a/workflow/engine/templates/bpmn/ProcessOptions.js
+++ b/workflow/engine/templates/bpmn/ProcessOptions.js
@@ -2994,11 +2994,65 @@ ProcessOptions.prototype.addTriggers= function()
                  });
     }
 
-  var removeTriggers = function(){
+    var removeTriggers = function() {
+    ids = Array();
 
+    editor.stopEditing();
+    var rowsSelected = Ext.getCmp('triggersGrid').getSelectionModel().getSelections();
+
+    if( rowsSelected.length == 0 ) {
+      PMExt.error('', _('ID_NO_SELECTION_WARNING'));
+      return false;
+    }
+
+    for(i=0; i<rowsSelected.length; i++)
+      ids[i] = rowsSelected[i].get('TRI_UID');
+
+    ids = ids.join(',');
+//First check whether selected Dynaform is assigned to a task steps or not.
+    Ext.Ajax.request({
+      url   : '../triggers/triggers_Ajax',
+      method: 'POST',
+      params: {
+        request   : 'verifyDependencies',
+        PRO_UID   : pro_uid,
+        TRI_UID   : ids
+      },
+      success: function(response) {
+                var result = Ext.util.JSON.decode(response.responseText);
+                if( result.success ){
+                  if( result.passed ) { //deleting the selected dyanoforms
+                    PMExt.confirm(_('ID_CONFIRM'), _('ID_DELETE_DYNAFORM_CONFIRM'), function(){
+                    Ext.Ajax.request({
+                        url   : '../processes/processes_Ajax.php',
+                        method: 'POST',
+                        params: {
+                          action      : 'deleteTriggers',
+                          TRI_UID     : ids
+                        },
+                        success: function(response) {
+                          var result = Ext.util.JSON.decode(response.responseText);
+                          if( result.success ){
+                            PMExt.notify( _('ID_STATUS') , result.message);
+
+                            //Reloading store after deleting dynaform
+                            triggerStore.reload();
+                          } else {
+                            PMExt.error(_('ID_ERROR'), result.message);
+                          }
+                        }
+                      });
+                    });
+                  } else {
+                    PMExt.error(_('ID_VALIDATION_ERROR'), result.message);
+                  }
+                } else {
+                  PMExt.error(_('ID_ERROR'), result.message);
+                }
+              }
+    });
   }
-
-  //edit triggers button
+//edit triggers button
   var btnEdit = new Ext.Button({
     id: 'btnEdit',
     text: _('ID_EDIT'),
@@ -3051,7 +3105,7 @@ ProcessOptions.prototype.addTriggers= function()
 
   var triggersGrid = new Ext.grid.GridPanel({
     store: triggerStore,
-    id : 'triggerGrid',
+    id : 'triggersGrid',
     loadMask: true,
     loadingText: 'Loading...',
     //renderTo: 'cases-grid',
@@ -3225,7 +3279,7 @@ var triggersForm = new Ext.FormPanel({
 
     });
 
-    var formWindow = new Ext.Window({
+ var formWindow = new Ext.Window({
         title: _('ID_TRIGGERS'),
         autoScroll: true,
         collapsible: false,