diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 5b6e2a311f..6fcbcd65b6 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -407,6 +407,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
 		InstallOptionalHaikuImagePackage gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip
 			: $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2010-03-23.zip ;
 		if $(HAIKU_GCC_VERSION[1]) = 2 {
+			# symlink to the appropriate system/lib[/gcc2] folder
 			AddSymlinkToHaikuHybridImage
 				develop abi x86 gcc2 tools gcc-2.95.3-haiku-090629 lib
 				: /system/lib libstdc++.r4.so : : true ;
@@ -1186,22 +1187,6 @@ if [ IsOptionalHaikuImagePackageAdded WifiFirmwareScriptData ] {
 		AddFilesToHaikuImage system data firmware broadcom43xx
 			: $(broadcom43xxFile) ;
 
-		# ipw2100
-		local FirmwareTopDirectory = [ FDirName
-			$(HAIKU_TOP) data system data firmware ] ;
-		local ipw2100FWArchive = [ FDirName
-			$(FirmwareTopDirectory) ipw2100 ipw2100-fw-1.3.tgz ] ;
-		AddFilesToHaikuImage system data firmware ipw2100
-			: $(ipw2100FWArchive) ;
-
-		# iprowifi2200
-		local FirmwareTopDirectory = [ FDirName
-			$(HAIKU_TOP) data system data firmware ] ;
-		local iprowifi2200FWArchive = [ FDirName
-			$(FirmwareTopDirectory) iprowifi2200 ipw2200-fw-3.1.tgz ] ;
-		AddFilesToHaikuImage system data firmware iprowifi2200
-			: $(iprowifi2200FWArchive) ;
-
 		# marvell88w8335
 		local marvelArchive = malo-firmware-1.4.tgz ;
 		local marvelURL = http://www.nazgul.ch/malo/$(marvelArchive) ;