diff --git a/bin/am b/bin/am
index b63f185ce..5046d3d0a 100755
--- a/bin/am
+++ b/bin/am
@@ -6,10 +6,7 @@
 # For usage, see the usage subroutine or run the script with no
 # command line arguments.
 #
-# $HeadURL: $
-# $LastChangedDate: $
-# $LastChangedBy: $
-# $LastChangedRevision: $
+# $Id$
 #    
 # ====================================================================
 require 5.6.0;
diff --git a/configure b/configure
index 38693a570..906cf8db3 100755
--- a/configure
+++ b/configure
@@ -284,7 +284,7 @@ done
 
 echo ""
 echo "-========================= A N O P E ==========================-"
-echo "For more detailed information on the features of Anope1.5 please"
+echo "For more detailed information on the features of Anope1.6 please"
 echo "read the self-named documentation found on the 'docs' directory."
 echo ""
 
diff --git a/data/tables.sql b/data/tables.sql
index 533a4c6e8..db9cbe8c1 100644
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -381,90 +381,3 @@ CREATE TABLE anope_os_szlines (
   expire int(11) NOT NULL default '0',
   PRIMARY KEY  (og_id)
 ) TYPE=MyISAM;
-
---
--- Table structure for table `bugs`
---
-
-DROP TABLE IF EXISTS bugs;
-CREATE TABLE bugs (
-  b_id int(9) NOT NULL auto_increment,
-  b_moduleid int(9) NOT NULL default '0',
-  b_title varchar(40) NOT NULL default '',
-  b_desc text NOT NULL,
-  b_reporter varchar(15) NOT NULL default '',
-  PRIMARY KEY  (b_id)
-) TYPE=MyISAM;
-
---
--- Table structure for table `modules`
---
-
-DROP TABLE IF EXISTS modules;
-CREATE TABLE modules (
-  m_id int(9) NOT NULL auto_increment,
-  m_name varchar(30) NOT NULL default '',
-  m_category enum('OperServ','NickServ','MemoServ','ChanServ','BotServ','HostServ','HelpServ','Misc') NOT NULL default 'Misc',
-  m_description longtext NOT NULL,
-  m_activated enum('0','1') NOT NULL default '0',
-  m_owner varchar(15) NOT NULL default '',
-  m_path varchar(40) NOT NULL default '',
-  m_updated date NOT NULL default '0000-00-00',
-  m_official enum('0','1') NOT NULL default '0',
-  m_version varchar(5) NOT NULL default '',
-  PRIMARY KEY  (m_id)
-) TYPE=MyISAM PACK_KEYS=0;
-
---
--- Table structure for table `requests`
---
-
-DROP TABLE IF EXISTS requests;
-CREATE TABLE requests (
-  r_id int(3) NOT NULL auto_increment,
-  r_title varchar(30) NOT NULL default '',
-  r_category enum('OperServ','NickServ','MemoServ','ChanServ','BotServ','HostServ','HelpServ','Misc') NOT NULL default 'Misc',
-  r_description longtext NOT NULL,
-  r_owner varchar(15) NOT NULL default 'Anonymous',
-  r_assigned varchar(15) NOT NULL default '',
-  PRIMARY KEY  (r_id)
-) TYPE=MyISAM;
-
---
--- Table structure for table `uploaded`
---
-
-DROP TABLE IF EXISTS uploaded;
-CREATE TABLE uploaded (
-  mu_id int(9) NOT NULL auto_increment,
-  mu_name varchar(30) NOT NULL default '',
-  mu_category enum('OperServ','NickServ','MemoServ','ChanServ','BotServ','HostServ','HelpServ','Misc') NOT NULL default 'Misc',
-  mu_description longtext NOT NULL,
-  mu_activated enum('0','1') NOT NULL default '0',
-  mu_owner varchar(15) NOT NULL default '',
-  mu_path varchar(40) NOT NULL default '',
-  mu_updated date NOT NULL default '0000-00-00',
-  mu_official enum('0','1') NOT NULL default '0',
-  mu_version varchar(5) NOT NULL default '',
-  PRIMARY KEY  (mu_id)
-) TYPE=MyISAM;
-
---
--- Table structure for table `users`
---
-
-DROP TABLE IF EXISTS users;
-CREATE TABLE users (
-  u_id int(9) NOT NULL auto_increment,
-  u_username varchar(15) NOT NULL default '',
-  u_password varchar(32) NOT NULL default '',
-  u_email varchar(40) NOT NULL default '',
-  u_location varchar(40) NOT NULL default '',
-  u_status enum('normal','coder','admin','root') NOT NULL default 'normal',
-  u_confirmed enum('0','1') NOT NULL default '1',
-  u_registered date NOT NULL default '0000-00-00',
-  u_lastvisit date NOT NULL default '0000-00-00',
-  u_hideemail enum('0','1') NOT NULL default '0',
-  PRIMARY KEY  (u_id)
-) TYPE=MyISAM PACK_KEYS=0;
-
diff --git a/version.log b/version.log
index c38b892e3..070c8461a 100644
--- a/version.log
+++ b/version.log
@@ -8,11 +8,15 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="6"
 VERSION_PATCH="0"
-VERSION_BUILD="4"
+VERSION_BUILD="6"
 VERSION_EXTRA=""
 
 # $Log$
 #
+# BUILD : 1.6.0 (6)
+# BUGS  : none
+# NOTES : Removed estra table definition from tables.sql. Minor fixes.
+#
 # BUILD : 1.6.0 (4)
 # BUGS  : none
 # NOTES : File cleanup and new AnopeManager script (bin/am) to work