diff --git a/public/views/edit-software.js b/public/views/edit-software.js
index 50c95c4..142077d 100644
--- a/public/views/edit-software.js
+++ b/public/views/edit-software.js
@@ -98,61 +98,7 @@ modulejs.define('EditSoftware', ['jquery', 'NoosferoRoot', 'AutoComplete', 'NewS
       });
 
 
-      $(".language-button-hide").click(function(event){
-        event.preventDefault();
-        $(".language-info").hide();
-        $(".language-button-show").show();
-        $(".language-button-hide").hide();
-      });
-
-      $(".language-button-show").click(function(event){
-        event.preventDefault();
-        $(".language-info").show();
-        $(".language-button-show").hide();
-        $(".language-button-hide").show();
-      });
-
-      $(".operating-system-button-hide").click(function(event){
-        event.preventDefault();
-        $(".operating-system-info").hide();
-        $(".operating-system-button-show").show();
-        $(".operating-system-button-hide").hide();
-      });
-
-      $(".operating-system-button-show").click(function(event){
-        event.preventDefault();
-        $(".operating-system-info").show();
-        $(".operating-system-button-show").hide();
-        $(".operating-system-button-hide").show();
-      });
 
-      $(".database-button-hide").click(function(event){
-        event.preventDefault();
-        $(".database-info").hide();
-        $(".database-button-show").show();
-        $(".database-button-hide").hide();
-      });
-
-      $(".database-button-show").click(function(event){
-        event.preventDefault();
-        $(".database-info").show();
-        $(".database-button-show").hide();
-        $(".database-button-hide").show();
-      });
-
-      $(".libraries-button-hide").click(function(event){
-        event.preventDefault();
-        $(".libraries-info").hide();
-        $(".libraries-button-show").show();
-        $(".libraries-button-hide").hide();
-      });
-
-      $(".libraries-button-show").click(function(event){
-        event.preventDefault();
-        $(".libraries-info").show();
-        $(".libraries-button-show").hide();
-        $(".libraries-button-hide").show();
-      });
 
       hide_show_public_software_fields();
       $("#software_public_software").click(hide_show_public_software_fields);
diff --git a/public/views/profile-tabs-software.js b/public/views/profile-tabs-software.js
index 1d80825..92ee237 100644
--- a/public/views/profile-tabs-software.js
+++ b/public/views/profile-tabs-software.js
@@ -1,4 +1,4 @@
-modulejs.define("ProfileTabsSoftware", ["jquery", "EditSoftware"], function($, EditSoftware) {
+modulejs.define("ProfileTabsSoftware", ["jquery"], function($) {
   "use strict";
 
   function hide_infos(){
@@ -13,6 +13,65 @@ modulejs.define("ProfileTabsSoftware", ["jquery", "EditSoftware"], function($, E
   }
 
 
+  function set_show_hide_dynamic_table_events() {
+    $(".language-button-hide").click(function(event){
+      event.preventDefault();
+      $(".language-info").hide();
+      $(".language-button-show").show();
+      $(".language-button-hide").hide();
+    });
+
+    $(".language-button-show").click(function(event){
+      event.preventDefault();
+      $(".language-info").show();
+      $(".language-button-show").hide();
+      $(".language-button-hide").show();
+    });
+
+    $(".operating-system-button-hide").click(function(event){
+      event.preventDefault();
+      $(".operating-system-info").hide();
+      $(".operating-system-button-show").show();
+      $(".operating-system-button-hide").hide();
+    });
+
+    $(".operating-system-button-show").click(function(event){
+      event.preventDefault();
+      $(".operating-system-info").show();
+      $(".operating-system-button-show").hide();
+      $(".operating-system-button-hide").show();
+    });
+
+    $(".database-button-hide").click(function(event){
+      event.preventDefault();
+      $(".database-info").hide();
+      $(".database-button-show").show();
+      $(".database-button-hide").hide();
+    });
+
+    $(".database-button-show").click(function(event){
+      event.preventDefault();
+      $(".database-info").show();
+      $(".database-button-show").hide();
+      $(".database-button-hide").show();
+    });
+
+    $(".libraries-button-hide").click(function(event){
+      event.preventDefault();
+      $(".libraries-info").hide();
+      $(".libraries-button-show").show();
+      $(".libraries-button-hide").hide();
+    });
+
+    $(".libraries-button-show").click(function(event){
+      event.preventDefault();
+      $(".libraries-info").show();
+      $(".libraries-button-show").hide();
+      $(".libraries-button-hide").show();
+    });
+  }
+
+
   return {
     isCurrentPage: function() {
       return $("#software-fields").length === 1;
@@ -21,8 +80,7 @@ modulejs.define("ProfileTabsSoftware", ["jquery", "EditSoftware"], function($, E
 
     init: function() {
       hide_infos();
-
-      EditSoftware.init();
+      set_show_hide_dynamic_table_events();
     }
   }
 });
diff --git a/views/profile/_software_tab.html.erb b/views/profile/_software_tab.html.erb
index a3b303f..0f7a3ca 100644
--- a/views/profile/_software_tab.html.erb
+++ b/views/profile/_software_tab.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag "mpog-validations" %>
 <table>
   <tr>
     <th colspan='2'><%= _('Software Information')%></th>
--
libgit2 0.21.2