diff --git a/service/src/main/java/com/ericsson/eiffel/remrem/generate/controller/RemremGenerateController.java b/service/src/main/java/com/ericsson/eiffel/remrem/generate/controller/RemremGenerateController.java
index 3c42c8b..a416319 100644
--- a/service/src/main/java/com/ericsson/eiffel/remrem/generate/controller/RemremGenerateController.java
+++ b/service/src/main/java/com/ericsson/eiffel/remrem/generate/controller/RemremGenerateController.java
@@ -184,8 +184,6 @@ public ResponseEntity<?> generate(final String msgProtocol, final String msgType
                         throw e;
                     } catch (REMGenerateException e) {
                         // Something went wrong. Add failure description to array of results.
-                      /*  partialSuccess = true;
-                        allSuccess=false;*/
                         failedCount++;
                         JsonObject response = new JsonObject();
                         createResponseEntity(HttpStatus.BAD_REQUEST, e.getMessage(), JSON_ERROR_STATUS, response);
@@ -228,7 +226,6 @@ public ResponseEntity<?> generate(final String msgProtocol, final String msgType
         }
     }
 
-
     /**
      * To display response in browser or application
      * @param status response code for the HTTP request
@@ -322,13 +319,8 @@ public JsonObject processEvent(String msgProtocol, String msgType, Boolean failI
         JsonObject parsedJson = parsedResponse.getAsJsonObject();
 
         if (parsedJson.has(JSON_ERROR_MESSAGE_FIELD)) {
-//            JsonObject eventResponse = new JsonObject();
-//            createResponseEntity(HttpStatus.BAD_REQUEST, parsedJson.toString(), JSON_ERROR_STATUS, eventResponse);
-//            return eventResponse;
             throw new REMGenerateException(response);
         } else {
-           /* JsonObject eventResponse = new JsonObject();
-            createResponseEntity(HttpStatus.OK, parsedJson.toString(), "SUCCESS", eventResponse);*/
             return parsedJson;
         }
     }