diff --git a/db/migrate/20141216183111_remove_operating_system_from_software_database.rb b/db/migrate/20141216183111_remove_operating_system_from_software_database.rb
new file mode 100644
index 0000000..6dcdf7e
--- /dev/null
+++ b/db/migrate/20141216183111_remove_operating_system_from_software_database.rb
@@ -0,0 +1,9 @@
+class RemoveOperatingSystemFromSoftwareDatabase < ActiveRecord::Migration
+  def up
+    remove_column :software_databases, :operating_system
+  end
+
+  def down
+    add_column :software_databases, :operating_system, :string
+  end
+end
diff --git a/db/migrate/20141216183459_remove_operating_system_from_software_language.rb b/db/migrate/20141216183459_remove_operating_system_from_software_language.rb
new file mode 100644
index 0000000..deb0f3f
--- /dev/null
+++ b/db/migrate/20141216183459_remove_operating_system_from_software_language.rb
@@ -0,0 +1,9 @@
+class RemoveOperatingSystemFromSoftwareLanguage < ActiveRecord::Migration
+  def up
+    remove_column :software_languages, :operating_system
+  end
+
+  def down
+    add_column :software_languages, :operating_system, :string
+  end
+end
diff --git a/lib/software_database.rb b/lib/software_database.rb
index 75c983e..6c7911f 100644
--- a/lib/software_database.rb
+++ b/lib/software_database.rb
@@ -1,22 +1,17 @@
 class SoftwareDatabase < ActiveRecord::Base
-  attr_accessible :version, :operating_system
+  attr_accessible :version
 
   belongs_to :software_info
   belongs_to :database_description
 
-  validates_length_of(
-    :version,
-    :maximum => 20,
-    :too_long => _("Software database is too long (maximum is 20 characters)")
-  )
+  validates_presence_of :database_description_id, :version
 
   validates_length_of(
-    :operating_system,
+    :version,
     :maximum => 20,
     :too_long => _("Software database is too long (maximum is 20 characters)")
   )
 
-  validates_presence_of :database_description_id, :version
   validates(
     :database_description_id,
     :numericality => {:greater_than_or_equal_to => 1}
diff --git a/lib/software_language.rb b/lib/software_language.rb
index faa011c..29f23c4 100644
--- a/lib/software_language.rb
+++ b/lib/software_language.rb
@@ -1,5 +1,5 @@
 class SoftwareLanguage < ActiveRecord::Base
-  attr_accessible :version, :operating_system
+  attr_accessible :version
 
   belongs_to :software_info
   belongs_to :programming_language
@@ -10,11 +10,5 @@ class SoftwareLanguage < ActiveRecord::Base
     :too_long => _("Software language is too long (maximum is 20 characters)")
   )
 
-  validates_length_of(
-    :operating_system,
-    :maximum => 20,
-    :too_long => _("Software language is too long (maximum is 20 characters)")
-  )
-
   validates_presence_of :version,:programming_language
 end
diff --git a/views/profile/_software_tab.html.erb b/views/profile/_software_tab.html.erb
index 07d4631..0cb4f30 100644
--- a/views/profile/_software_tab.html.erb
+++ b/views/profile/_software_tab.html.erb
@@ -54,7 +54,6 @@
         <% profile.software_info.software_databases.each do |database| %>
           <%= display_mpog_field(_('Name:'), DatabaseDescription.find(database.database_description_id), :name, true) %>
           <%= display_mpog_field(_('Version:'), database, :version, true) %>
-          <%= display_mpog_field(_('Operating System:'), database, :operating_system, true) %>
         <% end %>
       </table>
     </td>
@@ -73,7 +72,6 @@
        <% profile.software_info.software_languages.each do |language| %>
          <%= display_mpog_field(_('Name:'), language.programming_language , :name, true) %>
          <%= display_mpog_field(_('Version:'), language, :version, true) %>
-         <%= display_mpog_field(_('Operating System:'), language, :operating_system, true) %>
        <% end %>
      </table>
    </td>
--
libgit2 0.21.2