=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java	2015-01-02 13:41:19 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java	2015-01-07 04:25:08 +0000
@@ -61,6 +61,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.client.HttpClientErrorException;
 
 import javax.servlet.http.HttpServletRequest;
@@ -433,7 +434,7 @@
         registrationService.saveCompleteDataSetRegistrations( registrations, true );
     }
 
-    @RequestMapping( method = RequestMethod.DELETE, produces = "text/plain" )
+    @RequestMapping( method = RequestMethod.DELETE )
     public void deleteCompleteDataSetRegistration(
         @RequestParam Set<String> ds,
         @RequestParam String pe,
@@ -488,8 +489,7 @@
 
         if ( lockedDataSets.size() != 0 )
         {
-            ContextUtils
-                .conflictResponse( response, "Locked Data set(s) : " + StringUtils.join( lockedDataSets, ", " ) );
+            ContextUtils.conflictResponse( response, "Locked Data set(s) : " + StringUtils.join( lockedDataSets, ", " ) );
             return;
         }
 
@@ -499,13 +499,13 @@
 
         Set<OrganisationUnit> orgUnits = new HashSet<>();
         orgUnits.add( organisationUnit );
+
         if ( multiOu )
         {
             orgUnits.addAll( organisationUnit.getChildren() );
         }
 
         unRegisterCompleteDataSet( dataSets, period, orgUnits, attributeOptionCombo );
-
     }
 
     // -------------------------------------------------------------------------