diff --git a/src/scripts/nightly/conf/freebsd.amd64.config b/src/scripts/nightly/conf/freebsd.amd64.config
deleted file mode 100644
index e7b4985a..00000000
--- a/src/scripts/nightly/conf/freebsd.amd64.config
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPTDIR=/home/marcolz/src/empire/nightlybuild
-BOXDIR=boxes
-LOGDIR=logs
-SFLOGIN=marcolz
-EMPLOGIN=marcolz
-EMPTARGET=freebsd
-ARCH=amd64
-LOCALPATCHDIR=
-EMPPORT=8889
diff --git a/src/scripts/nightly/conf/freebsd.i386.config b/src/scripts/nightly/conf/freebsd.i386.config
deleted file mode 100644
index 7b435fe0..00000000
--- a/src/scripts/nightly/conf/freebsd.i386.config
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPTDIR=/home/marcolz/src/empire/nightlybuild
-BOXDIR=boxes
-LOGDIR=logs
-SFLOGIN=marcolz
-EMPLOGIN=marcolz
-EMPTARGET=freebsd
-ARCH=i386
-LOCALPATCHDIR=
-EMPPORT=8889
diff --git a/src/scripts/nightly/conf/interix.pc.config b/src/scripts/nightly/conf/interix.pc.config
deleted file mode 100644
index 9e9ed0f5..00000000
--- a/src/scripts/nightly/conf/interix.pc.config
+++ /dev/null
@@ -1,9 +0,0 @@
-SCRIPTDIR=/usr/local/src/empire/nightlybuild
-BOXDIR=boxes
-LOGDIR=logs
-SFLOGIN=marcolz
-EMPLOGIN=marcolz
-EMPTARGET=interix
-ARCH=pc
-LOCALPATCHDIR=
-EMPPORT=8889
diff --git a/src/scripts/nightly/conf/solaris.sparcv7.cc.config b/src/scripts/nightly/conf/solaris.sparcv7.cc.config
deleted file mode 100644
index 340e8272..00000000
--- a/src/scripts/nightly/conf/solaris.sparcv7.cc.config
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPTDIR=/home/marcolz/src/empire/nightlybuild
-BOXDIR=boxes
-LOGDIR=logs
-SFLOGIN=marcolz
-EMPLOGIN=marcolz
-EMPTARGET=solaris
-ARCH=sparcv7
-EXTRASUFFIX=cc
-LOCALPATCHDIR=patches/solaris.sparcv7.cc
-PATH="/opt/SUNWspro/bin:${PATH}"
-EMPPORT=8889
diff --git a/src/scripts/nightly/conf/solaris.sparcv7.gcc.config b/src/scripts/nightly/conf/solaris.sparcv7.gcc.config
deleted file mode 100644
index 0342c06f..00000000
--- a/src/scripts/nightly/conf/solaris.sparcv7.gcc.config
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPTDIR=/home/marcolz/src/empire/nightlybuild
-BOXDIR=boxes
-LOGDIR=logs
-SFLOGIN=marcolz
-EMPLOGIN=marcolz
-EMPTARGET=solaris
-ARCH=sparcv7
-EXTRASUFFIX=gcc
-LOCALPATCHDIR=patches/solaris.sparcv7.gcc
-EMPPORT=8888
diff --git a/src/scripts/nightly/conf/solaris.sparcv9.cc.config b/src/scripts/nightly/conf/solaris.sparcv9.cc.config
deleted file mode 100644
index 9e1a8f69..00000000
--- a/src/scripts/nightly/conf/solaris.sparcv9.cc.config
+++ /dev/null
@@ -1,11 +0,0 @@
-SCRIPTDIR=/home/marcolz/src/empire/nightlybuild
-BOXDIR=boxes
-LOGDIR=logs
-SFLOGIN=marcolz
-EMPLOGIN=marcolz
-EMPTARGET=solaris
-ARCH=sparcv9
-EXTRASUFFIX=cc
-LOCALPATCHDIR=patches/solaris.sparcv9.cc
-PATH="/opt/SUNWspro/bin:${PATH}"
-EMPPORT=8887
diff --git a/src/scripts/nightly/conf/solaris.sparcv9.gcc.config b/src/scripts/nightly/conf/solaris.sparcv9.gcc.config
deleted file mode 100644
index 10d1418e..00000000
--- a/src/scripts/nightly/conf/solaris.sparcv9.gcc.config
+++ /dev/null
@@ -1,10 +0,0 @@
-SCRIPTDIR=/home/marcolz/src/empire/nightlybuild
-BOXDIR=boxes
-LOGDIR=logs
-SFLOGIN=marcolz
-EMPLOGIN=marcolz
-EMPTARGET=solaris
-ARCH=sparcv9
-EXTRASUFFIX=gcc
-LOCALPATCHDIR=patches/solaris.sparcv9.gcc
-EMPPORT=8886
diff --git a/src/scripts/nightly/cron/cron.freebsd.amd64 b/src/scripts/nightly/cron/cron.freebsd.amd64
deleted file mode 100755
index 7df78c8d..00000000
--- a/src/scripts/nightly/cron/cron.freebsd.amd64
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd /home/marcolz/src/empire/nightlybuild/
-./nightlybuild.sh conf/freebsd.amd64.config
-./report.sh conf/freebsd.amd64.config | mutt -s 'empserver freebsd.amd64' empserver-devel@lists.sourceforge.net
diff --git a/src/scripts/nightly/cron/cron.freebsd.i386 b/src/scripts/nightly/cron/cron.freebsd.i386
deleted file mode 100755
index 14bed18f..00000000
--- a/src/scripts/nightly/cron/cron.freebsd.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd /home/marcolz/src/empire/nightlybuild/
-./nightlybuild.sh conf/freebsd.i386.config
-./report.sh conf/freebsd.i386.config | mutt -s 'empserver freebsd.i386' empserver-devel@lists.sourceforge.net
diff --git a/src/scripts/nightly/cron/cron.solaris.sparcv7.cc b/src/scripts/nightly/cron/cron.solaris.sparcv7.cc
deleted file mode 100755
index 7019306d..00000000
--- a/src/scripts/nightly/cron/cron.solaris.sparcv7.cc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd /home/marcolz/src/empire/nightlybuild/
-ksh ./nightlybuild.sh conf/solaris.sparcv7.cc.config
-ksh ./report.sh conf/solaris.sparcv7.cc.config | mutt -s 'empserver solaris.sparcv7.cc' empserver-devel@lists.sourceforge.net
diff --git a/src/scripts/nightly/cron/cron.solaris.sparcv7.gcc b/src/scripts/nightly/cron/cron.solaris.sparcv7.gcc
deleted file mode 100755
index 036d117c..00000000
--- a/src/scripts/nightly/cron/cron.solaris.sparcv7.gcc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd /home/marcolz/src/empire/nightlybuild/
-ksh ./nightlybuild.sh conf/solaris.sparcv7.gcc.config
-ksh ./report.sh conf/solaris.sparcv7.gcc.config | mutt -s 'empserver solaris.sparcv7.gcc' empserver-devel@lists.sourceforge.net
diff --git a/src/scripts/nightly/cron/cron.solaris.sparcv9.cc b/src/scripts/nightly/cron/cron.solaris.sparcv9.cc
deleted file mode 100755
index 43aa64be..00000000
--- a/src/scripts/nightly/cron/cron.solaris.sparcv9.cc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd /home/marcolz/src/empire/nightlybuild/
-NIGHTLY_SKIP_STEP=TESTSCRIPT ksh ./nightlybuild.sh conf/solaris.sparcv9.cc.config
-ksh ./report.sh conf/solaris.sparcv9.cc.config | mutt -s 'empserver solaris.sparcv9.cc' empserver-devel@lists.sourceforge.net
diff --git a/src/scripts/nightly/cron/cron.solaris.sparcv9.gcc b/src/scripts/nightly/cron/cron.solaris.sparcv9.gcc
deleted file mode 100755
index 96ffd9c7..00000000
--- a/src/scripts/nightly/cron/cron.solaris.sparcv9.gcc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd /home/marcolz/src/empire/nightlybuild/
-NIGHTLY_SKIP_STEP=TESTSCRIPT ksh ./nightlybuild.sh conf/solaris.sparcv9.gcc.config
-ksh ./report.sh conf/solaris.sparcv9.gcc.config | mutt -s 'empserver solaris.sparcv9.gcc' empserver-devel@lists.sourceforge.net
diff --git a/src/scripts/nightly/patches/solaris.sparcv7.cc/build.conf.patch b/src/scripts/nightly/patches/solaris.sparcv7.cc/build.conf.patch
deleted file mode 100644
index 5dd144f1..00000000
--- a/src/scripts/nightly/patches/solaris.sparcv7.cc/build.conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: empserver/build.conf
---- empserver/build.conf	Thu Feb 12 17:50:48 2004
-+++ empserver/build.conf	Sat Mar  6 14:45:21 2004
-@@ -40,7 +40,7 @@
- 
- # Please enter the C-compiler you are using (full path is allowed):
- # (For NT builds using MSVC, use "CC = CL")
--CC = gcc
-+CC = cc
- 
- # Please enter the linker you are using (full path is allowed):
- # (For NT builds using MSVC, using "LD = ld" works fine.)
diff --git a/src/scripts/nightly/patches/solaris.sparcv7.gcc/Make.sysdefs.patch b/src/scripts/nightly/patches/solaris.sparcv7.gcc/Make.sysdefs.patch
deleted file mode 100644
index 9683a22b..00000000
--- a/src/scripts/nightly/patches/solaris.sparcv7.gcc/Make.sysdefs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: empserver/Make.sysdefs
---- empserver/Make.sysdefs	Sat Mar  6 13:50:20 2004
-+++ empserver/Make.sysdefs	Sat Mar  6 13:50:02 2004
-@@ -96,7 +96,7 @@
- RTPCLFLAGS = 
- RTPCMASTER = GLOBALCFLAGS="$(RTPCCFLAGS)" GLOBALLFLAGS="$(RTPCLFLAGS)"
- 
--SOLCFLAGS = -g -DSVR4 -DRel4 -DUCONTEXT -Dsolaris
-+SOLCFLAGS = -g -DSVR4 -DRel4 -DUCONTEXT -Dsolaris $(GCCWARNFLAGS) -Wno-char-subscripts
- SOLLFLAGS = -lnsl -lsocket -lthread
- SOLMASTER = GLOBALCFLAGS="$(SOLCFLAGS)" GLOBALLFLAGS="$(SOLLFLAGS)"
- 
diff --git a/src/scripts/nightly/patches/solaris.sparcv7.gcc/build.conf.patch b/src/scripts/nightly/patches/solaris.sparcv7.gcc/build.conf.patch
deleted file mode 100644
index b84bc89d..00000000
--- a/src/scripts/nightly/patches/solaris.sparcv7.gcc/build.conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: empserver/build.conf
---- empserver/build.conf	Thu Feb 12 17:50:48 2004
-+++ empserver/build.conf	Sat Mar  6 15:36:39 2004
-@@ -44,7 +44,7 @@
- 
- # Please enter the linker you are using (full path is allowed):
- # (For NT builds using MSVC, using "LD = ld" works fine.)
--LD = ld
-+LD = gcc
- 
- # Please enter the maximum number of countries you want:
- MAXNOC = 99
diff --git a/src/scripts/nightly/patches/solaris.sparcv9.cc/Make.sysdefs.patch b/src/scripts/nightly/patches/solaris.sparcv9.cc/Make.sysdefs.patch
deleted file mode 100644
index 3bd333b4..00000000
--- a/src/scripts/nightly/patches/solaris.sparcv9.cc/Make.sysdefs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: empserver/Make.sysdefs
---- empserver/Make.sysdefs	Sat Mar  6 13:50:20 2004
-+++ empserver/Make.sysdefs	Sat Mar  6 14:53:03 2004
-@@ -96,8 +96,8 @@
- RTPCLFLAGS = 
- RTPCMASTER = GLOBALCFLAGS="$(RTPCCFLAGS)" GLOBALLFLAGS="$(RTPCLFLAGS)"
- 
--SOLCFLAGS = -g -DSVR4 -DRel4 -DUCONTEXT -Dsolaris
--SOLLFLAGS = -lnsl -lsocket -lthread
-+SOLCFLAGS = -g -DSVR4 -DRel4 -DUCONTEXT -Dsolaris -xarch=v9
-+SOLLFLAGS = -lnsl -lsocket -lthread -xarch=v9
- SOLMASTER = GLOBALCFLAGS="$(SOLCFLAGS)" GLOBALLFLAGS="$(SOLLFLAGS)"
- 
- SEQCFLAGS =   -O -DALLYHARBOR -DSHOWPLANE -DDROPANY -DREJECTS -DBMAP -DAUTONAV -DSCUTTLE -DCONVASAT -DORBIT -DABM -DGRIND -DPINPOINTMISSILE -DFALLOUT -DSAIL -DLOWSTARTMOB -DFIXREALMS -DBUYTAX -DNUKEFAILDETONATE -DMISSINGMISSILES
diff --git a/src/scripts/nightly/patches/solaris.sparcv9.cc/build.conf.patch b/src/scripts/nightly/patches/solaris.sparcv9.cc/build.conf.patch
deleted file mode 100644
index 5dd144f1..00000000
--- a/src/scripts/nightly/patches/solaris.sparcv9.cc/build.conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: empserver/build.conf
---- empserver/build.conf	Thu Feb 12 17:50:48 2004
-+++ empserver/build.conf	Sat Mar  6 14:45:21 2004
-@@ -40,7 +40,7 @@
- 
- # Please enter the C-compiler you are using (full path is allowed):
- # (For NT builds using MSVC, use "CC = CL")
--CC = gcc
-+CC = cc
- 
- # Please enter the linker you are using (full path is allowed):
- # (For NT builds using MSVC, using "LD = ld" works fine.)
diff --git a/src/scripts/nightly/patches/solaris.sparcv9.gcc/Make.sysdefs.patch b/src/scripts/nightly/patches/solaris.sparcv9.gcc/Make.sysdefs.patch
deleted file mode 100644
index 3a18a0aa..00000000
--- a/src/scripts/nightly/patches/solaris.sparcv9.gcc/Make.sysdefs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: empserver/Make.sysdefs
---- empserver/Make.sysdefs	Sat Mar  6 13:50:20 2004
-+++ empserver/Make.sysdefs	Sat Mar  6 13:52:31 2004
-@@ -96,8 +96,8 @@
- RTPCLFLAGS = 
- RTPCMASTER = GLOBALCFLAGS="$(RTPCCFLAGS)" GLOBALLFLAGS="$(RTPCLFLAGS)"
- 
--SOLCFLAGS = -g -DSVR4 -DRel4 -DUCONTEXT -Dsolaris
--SOLLFLAGS = -lnsl -lsocket -lthread
-+SOLCFLAGS = -g -DSVR4 -DRel4 -DUCONTEXT -Dsolaris $(GCCWARNFLAGS) -m64 -Wno-char-subscripts
-+SOLLFLAGS = -lnsl -lsocket -lthread -m64
- SOLMASTER = GLOBALCFLAGS="$(SOLCFLAGS)" GLOBALLFLAGS="$(SOLLFLAGS)"
- 
- SEQCFLAGS =   -O -DALLYHARBOR -DSHOWPLANE -DDROPANY -DREJECTS -DBMAP -DAUTONAV -DSCUTTLE -DCONVASAT -DORBIT -DABM -DGRIND -DPINPOINTMISSILE -DFALLOUT -DSAIL -DLOWSTARTMOB -DFIXREALMS -DBUYTAX -DNUKEFAILDETONATE -DMISSINGMISSILES
diff --git a/src/scripts/nightly/patches/solaris.sparcv9.gcc/build.conf.patch b/src/scripts/nightly/patches/solaris.sparcv9.gcc/build.conf.patch
deleted file mode 100644
index b84bc89d..00000000
--- a/src/scripts/nightly/patches/solaris.sparcv9.gcc/build.conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: empserver/build.conf
---- empserver/build.conf	Thu Feb 12 17:50:48 2004
-+++ empserver/build.conf	Sat Mar  6 15:36:39 2004
-@@ -44,7 +44,7 @@
- 
- # Please enter the linker you are using (full path is allowed):
- # (For NT builds using MSVC, using "LD = ld" works fine.)
--LD = ld
-+LD = gcc
- 
- # Please enter the maximum number of countries you want:
- MAXNOC = 99