diff --git a/nmap-os-db b/nmap-os-db
index f0f2fd13c..16cca497e 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -1338,23 +1338,6 @@ T7(R=Y%DF=N%T=FF%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FF%TG=FF%TOS=0|C0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=S%T=FF%TG=FF%TOSI=S|Z%CD=S%SI=S%DLI=S)
 
-# Cisco Aironet 1100 Series Wireless Access Point with 12.3(2)JA2 firmware
-Fingerprint Cisco Aironet 1100 WAP running IOS 12.3
-Class Cisco | IOS | 12.X | WAP
-SEQ(SP=F3-FD%GCD=<7%ISR=104-10E%TI=Z%II=RI%TS=U)
-OPS(O1=|M5B4%O2=|M578%O3=|M280%O4=|M218%O5=|M218%O6=|M109)
-WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
-ECN(R=Y%DF=N%T=FF%TG=FF%W=1020%O=|M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=FF%TG=FF%S=O%A=O|S+%F=A|AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FF%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FF%TG=FF%W=1020%S=O%A=O|S+%F=A|AS%O=|M109%RD=0%Q=)
-T4(R=Y%DF=N%T=FF%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FF%TG=FF%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FF%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FF%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FF%TG=FF%TOS=C0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=S%T=FF%TG=FF%TOSI=S%CD=S%SI=S|OS:S%DLI=S)
-
 # cisco AIR-AP1232AG-E-K9 Cisco IOS Software, C1200 Software (C1200-K9W7-M), Version 12.3(7)JA2, RELEASE SOFTWARE (fc1)
 # Cisco IOS Software, C1240 Software (C1240-K9W7-M), Version 12.3(8)JA2, RELEASE SOFTWARE (fc1)
 Fingerprint Cisco Aironet 1230 or 1240-series WAP (IOS 12.3)
@@ -2732,8 +2715,8 @@ T7(R=Y%DF=N%T=20%TG=20%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=20%TG=20%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=20%TG=20%TOSI=S%CD=S%SI=S%DLI=S)
 
-# Ipcop V1.4.11 (1.4.10 updated to 1.4.11)
-Fingerprint Ipcop V1.4.11 firewall (Linux 2.4.31)
+# IPCop V1.4.11 (1.4.10 updated to 1.4.11)
+Fingerprint IPCop V1.4.11 firewall (Linux 2.4.31)
 Class IPCop | Linux | 2.4.X | firewall
 SEQ(SP=C8-D2%GCD=<7%ISR=CA-D4%TI=Z%II=I%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
@@ -5237,23 +5220,6 @@ T7(R=Y%DF=Y%T=80%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=80%TG=80%TOS=0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=80%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 
-# Windows Vista RC1 build 5600 without any firewall
-Fingerprint Windows Vista RC1 build 5600 (firewall disabled)
-Class Microsoft | Windows | Vista | general purpose
-SEQ(SP=EE-F8%GCD=<7%ISR=108-112%TI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=80%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=80%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=80%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=80%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=80%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=80%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=80%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=80%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=80%TG=80%TOS=0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=OS:G)
-IE(DFI=N%T=80%TG=80%TOSI=Z%CD=Z%SI=+S%DLI=S)
-
 # Microsoft Windows XP Home SP1 (french) [Winver: Version 5.1 (numéro 2600.xpsp1.020828-1920 : Service Pack 1
 Fingerprint Microsoft Windows XP Home SP1
 Class Microsoft | Windows | XP | general purpose