diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 386670216..04fa07b34 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1312,15 +1312,12 @@ srv/web/ipfire/cgi-bin/qos.cgi
 srv/web/ipfire/cgi-bin/qosgraph.cgi
 srv/web/ipfire/cgi-bin/remote.cgi
 srv/web/ipfire/cgi-bin/services.cgi
-#srv/web/ipfire/cgi-bin/shaping.cgi
-#srv/web/ipfire/cgi-bin/shutdown.cgi
 srv/web/ipfire/cgi-bin/speed.cgi
 srv/web/ipfire/cgi-bin/system.cgi
 srv/web/ipfire/cgi-bin/time.cgi
 srv/web/ipfire/cgi-bin/traffic.cgi
 srv/web/ipfire/cgi-bin/traffics.cgi
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
-srv/web/ipfire/cgi-bin/upload.cgi
 srv/web/ipfire/cgi-bin/upnp.cgi
 srv/web/ipfire/cgi-bin/urlfilter.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
diff --git a/html/cgi-bin/upload.cgi b/html/cgi-bin/upload.cgi
deleted file mode 100644
index e2394cbd0..000000000
--- a/html/cgi-bin/upload.cgi
+++ /dev/null
@@ -1,187 +0,0 @@
-#!/usr/bin/perl
-#
-# SmoothWall CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The SmoothWall Team
-#
-# $Id: upload.cgi,v 1.2.2.21 2005/08/14 23:43:38 gespinasse Exp $
-#
-
-use File::Copy;
-use strict;
-
-# enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-my %uploadsettings=();
-my $errormessage = '';
-
-&Header::showhttpheaders();
-$uploadsettings{'ACTION'} = '';
-
-&Header::getcgihash(\%uploadsettings, {'wantfile' => 1, 'filevar' => 'FH'});
-
-my $extraspeedtouchmessage='';
-my $extrafritzdslmessage='';
-my $extraeciadslmessage='';
-my $modem='';
-my $firmwarename='';
-my $kernel='';
-
-my $speedtouch = &Header::speedtouchversion;
-if ($speedtouch == 4) {
-	$modem='v4_b';
-	$firmwarename="$Lang::tr{'upload'} ZZZL_3.012";
-} else {
-	$modem='v0123';
-	$firmwarename="$Lang::tr{'upload'} KQD6_3.012";
-}
-
-$kernel=`/bin/uname -r | /usr/bin/tr -d '\012'`;
-
-if ($uploadsettings{'ACTION'} eq $firmwarename) {
-	if ($modem eq 'v0123' || $modem eq 'v4_b') {
-		if (copy ($uploadsettings{'FH'}, "${General::swroot}/alcatelusb/firmware.$modem.bin") != 1) {
-			$errormessage = $!;
-		} else {
-			$extraspeedtouchmessage = $Lang::tr{'upload successful'};
-		}
-	}
-}
-elsif ($uploadsettings{'ACTION'} eq "$Lang::tr{'upload'} fcdsl-${General::version}.tgz")
-{
-	if (copy ($uploadsettings{'FH'}, "/var/patches/fcdsl-x.tgz") != 1) {
-		$errormessage = $!;
-	} else {
-		$extrafritzdslmessage = $Lang::tr{'upload successful'};
-	}
-}
-elsif ($uploadsettings{'ACTION'} eq $Lang::tr{'upload synch.bin'})
-{
-	if (copy ($uploadsettings{'FH'}, "${General::swroot}/eciadsl/synch.bin") != 1) {
-		$errormessage = $!;
-	} else {
-		$extraeciadslmessage = $Lang::tr{'upload successful'};
-	}
-}
-
-&Header::openpage($Lang::tr{'firmware upload'}, 1, '');
-
-&Header::openbigbox('100%', 'left', '', $errormessage);
-
-if ($errormessage) {
-	&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
-	print "<font class='base'>$errormessage&nbsp;</font>\n";
-	&Header::closebox();
-}
-print "<form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'>\n";
-
-&Header::openbox('100%','left', $Lang::tr{'alcatelusb upload'});
-print <<END
-<table width='100%'>
-<tr>
-	<td colspan='4'>$Lang::tr{'alcatelusb help'}<br />
-	URL: <a href='http://www.speedtouch.com/support.htm'>http://www.speedtouch.com/support.htm</a>
-	</td>
-</tr>
-<tr><td colspan='4'>$Lang::tr{'modem'}: Rev <b>$speedtouch</b></td></tr>
-<tr>
-	<td width='5%' class='base' nowrap='nowrap'>$Lang::tr{'upload file'}:&nbsp;</td>
-	<td width='45%'><input type="file" size='30' name="FH" /></td>
-	<td width='35%' align='center'><input type='submit' name='ACTION' value='$firmwarename' /></td>
-	<td width='15%'>
-END
-;
-if (-e "${General::swroot}/alcatelusb/firmware.$modem.bin") {
-	if ($extraspeedtouchmessage ne '') {
-		print ("$extraspeedtouchmessage</td>");
-	} else {
-		print ("$Lang::tr{'present'}</td>");
-	}
-} else {
-	print ("$Lang::tr{'not present'}</td>");
-}
-print <<END
-</tr>
-</table>
-END
-;
-
-&Header::closebox();
-
-&Header::openbox('100%','left', $Lang::tr{'eciadsl upload'});
-print <<END
-<table width='100%'>
-<tr>
-	<td colspan='4'>$Lang::tr{'eciadsl help'}<br />
-	URL: <a href='http://eciadsl.flashtux.org/'>http://eciadsl.flashtux.org/</a>
-	</td>
-</tr>
-<tr>
-	<td width='5%' class='base' nowrap='nowrap'>$Lang::tr{'upload file'}:&nbsp;</td>
-	<td width='45%'><input type="file" size='30' name="FH" /></td>
-	<td width='35%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'upload synch.bin'}' /></td>
-	<td width='15%'>
-END
-;
-if (-e "${General::swroot}/eciadsl/synch.bin") {
-	if ($extraeciadslmessage ne '') {
-		print ("$extraeciadslmessage</td>");
-	} else {
-		print ("$Lang::tr{'present'}</td>");
-	}
-} else {
-	print ("$Lang::tr{'not present'}</td>");
-}
-print <<END
-</tr>
-</table>
-END
-;
-&Header::closebox();
-
-&Header::openbox('100%','left', $Lang::tr{'fritzdsl upload'});
-print <<END
-<table width='100%'>
-<tr>
-	<td colspan='4'>$Lang::tr{'fritzdsl help'}<br />
-	URL: <a href='http://www.ipfire.org/'>http://www.ipfire.org/</a>
-	</td>
-</tr>
-<tr>
-	<td width='5%' class='base' nowrap='nowrap'>$Lang::tr{'upload file'}:&nbsp;</td>
-	<td width='45%'><input type="file" size='30' name="FH" /></td>
-	<td width='35%' align='center'><input type='submit' name='ACTION' value="$Lang::tr{'upload'} fcdsl-${General::version}.tgz"/></td>
-	<td width='15%'>
-END
-;
-if ($extrafritzdslmessage ne '') {
-	print ("$extrafritzdslmessage</td></tr><tr><td>&nbsp;</td><td><pre>");
-	print `/usr/local/bin/installfcdsl`;
-	print ("</pre></td>");
-} else {
-	if (-e "/lib/modules/$kernel/misc/fcdsl.o.gz") {
-		print ("$Lang::tr{'present'}</td>");
-	} else {
-		print ("$Lang::tr{'not present'}</td>");
-	}
-}
-print <<END
-</tr>
-</table>
-END
-;
-&Header::closebox();
-
-print "</form>\n";
-
-&Header::closebigbox();
-
-&Header::closepage();