diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 6a25078e5e..236c147cb4 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-21  Esteban Sanchez  <estebans@artica.es>
+
+	* pandoradb.sql: Removed inventory tables and fields from previous
+	commit.
+
 2008-10-22  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/styles/op.css,
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 14376d36e3..083b9d1f97 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -494,7 +494,6 @@ CREATE TABLE IF NOT EXISTS `tserver` (
   `prediction_server` tinyint(3) unsigned NOT NULL default '0',
   `wmi_server` tinyint(3) unsigned NOT NULL default '0',
   `export_server` tinyint(3) unsigned NOT NULL default '0',
-  `inventory_server` tinyint(3) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id_server`),
 	KEY `name` (`name`),
 	KEY `keepalive` (`keepalive`),
@@ -547,7 +546,8 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
   `fecha_registro` datetime NOT NULL default '0000-00-00 00:00:00',
   `direccion` varchar(100) default '',
   `telefono` varchar(100) default '',
-  `nivel` tinyint(1) NOT NULL default '0'
+  `nivel` tinyint(1) NOT NULL default '0',
+  PRIMARY KEY (`id_usuario`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -726,33 +726,3 @@ CREATE TABLE IF NOT EXISTS `tplanned_downtime_agents` (
   `id_downtime` mediumint(8) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `tmodule_inventory` (
- `id_module_inventory` int(10) NOT NULL auto_increment,
- `id_os` int(10) unsigned NOT NULL,
- `name` varchar(100) default '',
- `description` varchar(100) default '',
- `interpreter` varchar(100) default '',
- `code` BLOB NOT NULL,
- PRIMARY KEY  (`id_module_inventory`),
- FOREIGN KEY (`id_os`) REFERENCES tconfig_os(`id_os`)
-   ON UPDATE CASCADE ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `tagent_module_inventory` (
- `id_agent_module_inventory` int(10) NOT NULL auto_increment,
- `id_agente` int(10) unsigned NOT NULL,
- `id_module_inventory` int(10) NOT NULL,
- `target` varchar(100) default '',
- `interval` int(10) unsigned NOT NULL default '3600',
- `username` varchar(100) default '',
- `password` varchar(100) default '',
- `data` BLOB NOT NULL,
- `timestamp` datetime default '0000-00-00 00:00:00',
- `flag` tinyint(1) unsigned default '1',
- PRIMARY KEY  (`id_agent_module_inventory`),
- FOREIGN KEY (`id_agente`) REFERENCES tagente(`id_agente`)
-   ON UPDATE CASCADE ON DELETE CASCADE,
- FOREIGN KEY (`id_module_inventory`) REFERENCES tmodule_inventory(`id_module_inventory`)
-   ON UPDATE CASCADE ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;