diff --git a/src/cloud/occi/lib/ui/public/js/occi.js b/src/cloud/occi/lib/ui/public/js/occi.js
index b5444a50c7..004938dc67 100644
--- a/src/cloud/occi/lib/ui/public/js/occi.js
+++ b/src/cloud/occi/lib/ui/public/js/occi.js
@@ -64,71 +64,6 @@ var OCCI = {
     },
 
     "Helper": {
-        "resource_state": function(type, value)
-        {
-            switch(type)
-            {
-                case "HOST","host":
-                    return ["INIT",
-                            "MONITORING",
-                            "MONITORED",
-                            "ERROR",
-                            "DISABLED"][value];
-                    break;
-                case "HOST_SIMPLE","host_simple":
-                    return ["ON",
-                            "ON",
-                            "ON",
-                            "ERROR",
-                            "OFF"][value];
-                    break;
-                case "VM","vm":
-                    return ["INIT",
-                            "PENDING",
-                            "HOLD",
-                            "ACTIVE",
-                            "STOPPED",
-                            "SUSPENDED",
-                            "DONE",
-                            "FAILED"][value];
-                    break;
-                case "VM_LCM","vm_lcm":
-                    return ["LCM_INIT",
-                            "PROLOG",
-                            "BOOT",
-                            "RUNNING",
-                            "MIGRATE",
-                            "SAVE_STOP",
-                            "SAVE_SUSPEND",
-                            "SAVE_MIGRATE",
-                            "PROLOG_MIGRATE",
-                            "PROLOG_RESUME",
-                            "EPILOG_STOP",
-                            "EPILOG",
-                            "SHUTDOWN",
-                            "CANCEL",
-                            "FAILURE",
-                            "CLEANUP",
-                            "UNKNOWN"][value];
-                    break;
-                case "IMAGE","image":
-                    return ["INIT",
-                            "READY",
-                            "USED",
-                            "DISABLED",
-                            "LOCKED",
-                            "ERROR"][value];
-                    break;
-                default:
-                    return;
-            }
-        },
-
-        "image_type": function(value)
-        {
-            return ["OS", "CDROM", "DATABLOCK"][value];
-        },
-
         "action": function(action, params)
         {
             obj = {
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/compute.js b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
index aaab2fc1c4..c5bc985d1b 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/compute.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
@@ -523,7 +523,7 @@ function updateVMInfo(request,vm){
               </tr>\
               <tr>\
                  <td class="key_td">'+tr("Instance type")+'</td>\
-                 <td class="value_td">'+vm_info.INSTANCE_TYPE+'</td>\
+                 <td class="value_td">'+(vm_info.INSTANCE_TYPE ? vm_info.INSTANCE_TYPE : "--")+'</td>\
               </tr>\
               <tr>\
                  <td class="key_td">'+tr("State")+'</td>\
@@ -739,6 +739,7 @@ function popUpCreateVMDialog(){
 
         if (!vm_name.length){
             notifyError("Please specify a name for the virtual machine");
+            return false;
         };
 
         var vm = {
@@ -1043,7 +1044,7 @@ function vncCallback(request,response){
 
 function vncIcon(vm){
     var graphics = vm.TEMPLATE.GRAPHICS;
-    var state = OCCI.Helper.resource_state("vm_lcm",vm.LCM_STATE);
+    var state = vm.STATE;
     var gr_icon;
     if (graphics && graphics.TYPE == "vnc" && state == "RUNNING"){
         gr_icon = '<a class="vnc" href="#" vm_id="'+vm.ID+'">';
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/storage.js b/src/cloud/occi/lib/ui/public/js/plugins/storage.js
index 5b7f768d40..b4542daa82 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/storage.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/storage.js
@@ -373,7 +373,7 @@ function updateImageInfo(request,img){
            </tr>\
            <tr>\
              <td class="key_td">'+tr("Type")+'</td>\
-             <td class="value_td">'+OCCI.Helper.image_type(img_info.TYPE)+'</td>\
+             <td class="value_td">'+img_info.TYPE+'</td>\
            </tr>\
            <tr>\
              <td class="key_td">'+tr("Persistent")+'</td>\