diff --git a/config/Config.in b/config/Config.in
index f434bde45..4721ac446 100644
--- a/config/Config.in
+++ b/config/Config.in
@@ -63,11 +63,6 @@ choice
     depends on CONFIG_PLATFORM_WIN32
     default CONFIG_VISUAL_STUDIO_7_0
 
-config CONFIG_VISUAL_STUDIO_6_0
-    bool "Visual Studio 6.0 (VC98)"
-    help
-        Use Microsoft's Visual Studio 6.0 platform.
-
 config CONFIG_VISUAL_STUDIO_7_0
     bool "Visual Studio 7.0 (2003)"
     help 
@@ -80,11 +75,6 @@ config CONFIG_VISUAL_STUDIO_8_0
 
 endchoice
 
-config CONFIG_VISUAL_STUDIO_6_0_BASE
-    string "Base"
-    depends on CONFIG_VISUAL_STUDIO_6_0
-    default "c:\\Program Files\\Microsoft Visual Studio"
-
 config CONFIG_VISUAL_STUDIO_7_0_BASE
     string "Base"
     depends on CONFIG_VISUAL_STUDIO_7_0
diff --git a/config/linuxconfig b/config/linuxconfig
index 220060c00..d1d883e09 100644
--- a/config/linuxconfig
+++ b/config/linuxconfig
@@ -12,10 +12,8 @@ CONFIG_PLATFORM_LINUX=y
 #
 PREFIX="/usr/local"
 # CONFIG_DEBUG is not set
-# CONFIG_VISUAL_STUDIO_6_0 is not set
 # CONFIG_VISUAL_STUDIO_7_0 is not set
 # CONFIG_VISUAL_STUDIO_8_0 is not set
-CONFIG_VISUAL_STUDIO_6_0_BASE=""
 CONFIG_VISUAL_STUDIO_7_0_BASE=""
 CONFIG_VISUAL_STUDIO_8_0_BASE=""
 CONFIG_EXTRA_CFLAGS_OPTIONS=""
diff --git a/config/makefile.conf b/config/makefile.conf
index aff790995..fe9ba26d7 100644
--- a/config/makefile.conf
+++ b/config/makefile.conf
@@ -31,12 +31,6 @@ all:
 # Win32 
 ifdef CONFIG_PLATFORM_WIN32
 
-ifdef CONFIG_VISUAL_STUDIO_6_0
-CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_6_0_BASE))
-export INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_6_0_BASE)\vc98\Include")
-export LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_6_0_BASE)\vc98\Lib")
-PATH:=$(CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX)/common/msdev98/bin:$(CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX)/vc98/bin:$(PATH)
-else
 ifdef CONFIG_VISUAL_STUDIO_7_0
 CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_7_0_BASE))
 export INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\include;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\platformsdk\include")
@@ -52,13 +46,12 @@ stuff:
 	@echo $(INCLUDE)
 endif
 endif
-endif
 
 CC=cl.exe
 LD=link.exe
 AXTLS_INCLUDE=$(shell cygpath -w $(AXTLS_HOME))
 CFLAGS+=/nologo /W3 /D"WIN32" /D"_MBCS" /D"_CONSOLE" /D"_CRT_SECURE_NO_DEPRECATE" /FD /I"$(AXTLS_INCLUDE)crypto" /I"$(AXTLS_INCLUDE)ssl" /I"$(AXTLS_INCLUDE)config" /c 
-LDFLAGS=/nologo /subsystem:console /machine:I386 Advapi32.lib
+LDFLAGS=/nologo /subsystem:console /machine:I386
 LDSHARED = /dll
 AR=lib /nologo
 
diff --git a/config/win32config b/config/win32config
index be5ac45f8..ae6abf18b 100644
--- a/config/win32config
+++ b/config/win32config
@@ -17,10 +17,8 @@ PREFIX=""
 #
 # Microsoft Compiler Options
 #
-# CONFIG_VISUAL_STUDIO_6_0 is not set
 # CONFIG_VISUAL_STUDIO_7_0 is not set
 CONFIG_VISUAL_STUDIO_8_0=y
-CONFIG_VISUAL_STUDIO_6_0_BASE=""
 CONFIG_VISUAL_STUDIO_7_0_BASE=""
 CONFIG_VISUAL_STUDIO_8_0_BASE="c:\\Program Files\\Microsoft Visual Studio 8"
 CONFIG_EXTRA_CFLAGS_OPTIONS=""
diff --git a/crypto/crypto.h b/crypto/crypto.h
index 0becbd5cc..4b4cdc406 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-#include "os_port.h"
 #include "config.h"
+#include "os_port.h"
 
 /* enable features based on a 'super-set' capbaility. */
 #if defined(CONFIG_SSL_FULL_MODE) 
diff --git a/httpd/Config.in b/httpd/Config.in
index 512aa33e7..cbbbc7d5e 100644
--- a/httpd/Config.in
+++ b/httpd/Config.in
@@ -54,11 +54,11 @@ config CONFIG_HTTP_TIMEOUT
         Set the timeout of a connection in seconds.
 
 menu "CGI"
+depends on !CONFIG_PLATFORM_WIN32
 
 config CONFIG_HTTP_HAS_CGI
     bool "Enable CGI"
     default y
-    depends on !CONFIG_PLATFORM_WIN32
     help
         Enable the CGI capability. Not available on Win32 platforms.
 
diff --git a/ssl/Config.in b/ssl/Config.in
index 1b6f4641b..0a11ef55f 100644
--- a/ssl/Config.in
+++ b/ssl/Config.in
@@ -234,15 +234,12 @@ config CONFIG_USE_DEV_URANDOM
 
 config CONFIG_WIN32_USE_CRYPTO_LIB
     bool "Use Win32 Crypto Library"
-    default y if !CONFIG_VISUAL_STUDIO_6_0
-    default n if CONFIG_VISUAL_STUDIO_6_0
     depends on CONFIG_PLATFORM_WIN32
     help 
         Microsoft produce a Crypto API which requires the Platform SDK to be
         installed. It's used for the RNG.
 
-        This will be the default on most Win32 systems. If using Visual Studio
-        6.0, then the SDK containing the crypto libraries must be used.
+        This will be the default on most Win32 systems.
 
 config CONFIG_OPENSSL_COMPATIBLE
     bool "Enable openssl API compatibility"
diff --git a/ssl/Makefile b/ssl/Makefile
index 2dcbeceec..a8ec01c9f 100644
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -44,7 +44,7 @@ endif
 LIBMAJOR=$(BASETARGET).1
 LIBMINOR=$(BASETARGET).1.2
 else
-TARGET1=$(AXTLS_HOME)/axtls.lib
+TARGET1=$(AXTLS_HOME)/$(STAGE)/axtls.lib
 TARGET2=$(AXTLS_HOME)/$(STAGE)/axtls.dll
 STATIC_LIB=$(AXTLS_HOME)/$(STAGE)/axtls.static.lib
 CRYPTO_PATH=$(AXTLS_HOME)\\crypto\\
diff --git a/www/lua/tcgi1.lua b/www/lua/tcgi1.lua
deleted file mode 100644
index b152cd9db..000000000
--- a/www/lua/tcgi1.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-io.stdout:write"Content-type: text/html\n\n"
-
-for i,v in pairs{"QUERY_STRING", } do
-	io.stdout:write (string.format ("%s = %s", v, os.getenv(v) or ' '))
-end
-io.stdout:write "<br>\n"
-
-local post_data = io.stdin:read"*a"
-io.stdout:write (string.format ("post_data = {%s}", post_data))