diff --git a/release/script/cpproj b/release/script/cpproj
index 7b7fb517a..46c640cf2 100755
--- a/release/script/cpproj
+++ b/release/script/cpproj
@@ -30,7 +30,6 @@ if [ -d ${src}/include ] ; then
 fi
 cp ${src}/src/* ${dst}/src >/dev/null 2>&1
 cp ${src}/*.sln ${dst} >/dev/null 2>&1
-cp ${src}/*.vcproj ${dst} >/dev/null 2>&1
 cp ${src}/*.vcxproj ${dst} >/dev/null 2>&1
 cp ${src}/*.vcxproj.filters ${dst} >/dev/null 2>&1
 cp ${src}/Makefile* ${dst} >/dev/null 2>&1
@@ -38,9 +37,6 @@ cp ${src}/*.make ${dst} >/dev/null 2>&1
 cp ${src}/*.progen ${dst} >/dev/null 2>&1
 cp ${src}/CMakeLists.txt ${dst} >/dev/null 2>&1
 
-if [ "`find ${src} -name '*.vxbuild'`" != "" ] ; then
-	cp ${src}/*.vxbuild ${dst} >/dev/null 2>&1
-fi
 if [ "`find ${src} -name '*.bndlspec'`" != "" ] ; then
 	cp ${src}/*.bndlspec ${dst} >/dev/null 2>&1
 fi
@@ -70,7 +66,6 @@ if [ -d ${src}/testsuite ] ; then
 	fi
 
 	cp ${src}/testsuite/src/* ${dst}/testsuite/src >/dev/null 2>&1
-	cp ${src}/testsuite/*.vcproj ${dst}/testsuite >/dev/null 2>&1
 	cp ${src}/testsuite/*.vcxproj ${dst}/testsuite >/dev/null 2>&1
 	cp ${src}/testsuite/*.vcxproj.filters ${dst}/testsuite >/dev/null 2>&1
 	cp ${src}/testsuite/Makefile* ${dst}/testsuite >/dev/null 2>&1
@@ -83,12 +78,6 @@ if [ -d ${src}/testsuite ] ; then
 		cp -R ${src}/testsuite/cmake/* ${dst}/testsuite/cmake >/dev/null 2>&1
 	fi
 
-	if [ "`find ${src}/testsuite -name '*.opt'`" != "" ] ; then
-		cp ${src}/testsuite/*.opt ${dst}/testsuite >/dev/null 2>&1
-	fi
-	if [ "`find ${src}/testsuite -name '*.vxbuild'`" != "" ] ; then
-		cp ${src}/testsuite/*.vxbuild ${dst}/testsuite >/dev/null 2>&1
-	fi
 	if [ "`find ${src}/testsuite -name '*.properties'`" != "" ] ; then
 		cp ${src}/testsuite/*.properties ${dst}/testsuite >/dev/null 2>&1
 	fi
@@ -119,9 +108,9 @@ if [ -d ${src}/samples ] ; then
 	cp ${src}/samples/Makefile* ${dst}/samples >/dev/null 2>&1
 	cp ${src}/samples/*.progen ${dst}/samples >/dev/null 2>&1
 	cp ${src}/samples/CMakeLists.txt ${dst}/samples >/dev/null 2>&1
-	
+
 	samples=`find ${src}/samples/* -type d -print -prune | sed "s:^.*/::"`
-	
+
 	for sample in $samples ;
 	do
 		if [ -d "${src}/samples/${sample}/src" ] ; then
@@ -150,8 +139,7 @@ if [ -d ${src}/samples ] ; then
 				mkdir -p ${dst}/samples/${sample}/media
 				cp -R ${src}/samples/${sample}/media/* ${dst}/samples/${sample}/media >/dev/null 2>&1
 			fi
-			
-			cp ${src}/samples/${sample}/*.vcproj ${dst}/samples/${sample} >/dev/null 2>&1
+
 			cp ${src}/samples/${sample}/*.vcxproj ${dst}/samples/${sample} >/dev/null 2>&1
 			cp ${src}/samples/${sample}/*.vcxproj.filters ${dst}/samples/${sample} >/dev/null 2>&1
 			cp ${src}/samples/${sample}/Makefile* ${dst}/samples/${sample} >/dev/null 2>&1
@@ -163,16 +151,7 @@ if [ -d ${src}/samples ] ; then
 				mkdir -p ${dst}/samples/${sample}/cmake
 				cp -R ${src}/samples/${sample}/cmake/* ${dst}/samples/${sample}/cmake >/dev/null 2>&1
 			fi
-			
-			if [ "`find ${src}/samples/${sample}/ -name '*.vmsbuild'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.vmsbuild ${dst}/samples/${sample} >/dev/null 2>&1
-			fi
-			if [ "`find ${src}/samples/${sample}/ -name '*.opt'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.opt ${dst}/samples/${sample} >/dev/null 2>&1
-			fi
-			if [ "`find ${src}/samples/${sample}/ -name '*.vxbuild'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.vxbuild ${dst}/samples/${sample} >/dev/null 2>&1
-			fi
+
 			if [ "`find ${src}/samples/${sample}/ -name '*.properties'`" != "" ] ; then
 				cp ${src}/samples/${sample}/*.properties ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
@@ -191,12 +170,12 @@ if [ -d ${src}/samples ] ; then
 			if [ "`find ${src}/samples/${sample}/ -name '*.bndlspec'`" != "" ] ; then
 				cp ${src}/samples/${sample}/*.bndlspec ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
-			
+
 			if [ -d ${src}/samples/${sample}/include ] ; then
 				mkdir -p ${dst}/samples/${sample}/include
 				cp -R ${src}/samples/${sample}/include/* ${dst}/samples/${sample}/include >/dev/null 2>&1
-			fi	
-	
+			fi
+
 			if [ -d ${src}/samples/${sample}/bin ] ; then
 				mkdir -p ${dst}/samples/${sample}/bin
 				if [ "`find ${src}/samples/${sample}/bin/ -name '*.properties'`" != "" ] ; then
diff --git a/release/script/mkrelease b/release/script/mkrelease
index 202057d22..1bdb0065f 100755
--- a/release/script/mkrelease
+++ b/release/script/mkrelease
@@ -128,36 +128,17 @@ mkdir -p ${target}/CppUnit
 mkdir -p ${target}/CppUnit/doc
 mkdir -p ${target}/CppUnit/include/CppUnit
 mkdir -p ${target}/CppUnit/src
-mkdir -p ${target}/CppUnit/WinTestRunner
-mkdir -p ${target}/CppUnit/WinTestRunner/include/WinTestRunner
-mkdir -p ${target}/CppUnit/WinTestRunner/src
-mkdir -p ${target}/CppUnit/WinTestRunner/res
 
 cp ${POCO_BASE}/CppUnit/doc/* ${target}/CppUnit/doc >/dev/null 2>&1
 cp ${POCO_BASE}/CppUnit/include/CppUnit/* ${target}/CppUnit/include/CppUnit >/dev/null 2>&1
 cp ${POCO_BASE}/CppUnit/src/* ${target}/CppUnit/src >/dev/null 2>&1
 cp ${POCO_BASE}/CppUnit/*.sln ${target}/CppUnit >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/*.vcproj ${target}/CppUnit >/dev/null 2>&1
 cp ${POCO_BASE}/CppUnit/*.vcxproj ${target}/CppUnit >/dev/null 2>&1
 cp ${POCO_BASE}/CppUnit/*.vcxproj.filters ${target}/CppUnit >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/*.vcxproj.user ${target}/CppUnit >/dev/null 2>&1
 cp ${POCO_BASE}/CppUnit/Makefile ${target}/CppUnit >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/*.vxbuild ${target}/CppUnit >/dev/null 2>&1
 cp ${POCO_BASE}/CppUnit/*.progen ${target}/CppUnit >/dev/null 2>&1
 cp ${POCO_BASE}/CppUnit/CMakeLists.txt ${target}/CppUnit >/dev/null 2>&1
 
-cp ${POCO_BASE}/CppUnit/WinTestRunner/include/WinTestRunner/* ${target}/CppUnit/WinTestRunner/include/WinTestRunner >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/WinTestRunner/src/* ${target}/CppUnit/WinTestRunner/src >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/WinTestRunner/res/WinTestRunner.rc ${target}/CppUnit/WinTestRunner/res >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/WinTestRunner/res/Resource.h ${target}/CppUnit/WinTestRunner/res >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcproj ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj.filters ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj.user ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/WinTestRunner/*.progen ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
-cp ${POCO_BASE}/CppUnit/WinTestRunner/CMakeLists.txt ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
-
-
 #
 # Copy components
 #
@@ -416,44 +397,6 @@ distclean:
 ENDOFSCRIPT
 
 
-#
-# Create Visual Studio 9 build script
-#
-cat >${target}/build_vs90.cmd <<'ENDOFSCRIPT'
-@echo off
-if defined VS90COMNTOOLS (
-call "%VS90COMNTOOLS%\vsvars32.bat")
-buildwin 90 build shared both Win32 samples
-ENDOFSCRIPT
-
-
-#
-# Create Visual Studio 10 build script
-#
-cat >${target}/build_vs100.cmd <<'ENDOFSCRIPT'
-@echo off
-buildwin 100 build shared both Win32 samples
-ENDOFSCRIPT
-
-
-#
-# Create Visual Studio 11 build script
-#
-cat >${target}/build_vs110.cmd <<'ENDOFSCRIPT'
-@echo off
-buildwin 110 build shared both Win32 samples
-ENDOFSCRIPT
-
-
-#
-# Create Visual Studio 12 build script
-#
-cat >${target}/build_vs120.cmd <<'ENDOFSCRIPT'
-@echo off
-buildwin 120 build shared both Win32 samples
-ENDOFSCRIPT
-
-
 #
 # Create Visual Studio 14 build script
 #
@@ -473,29 +416,11 @@ ENDOFSCRIPT
 
 
 #
-# Create Visual Studio 9 WinCE build script
+# Create Visual Studio 16 build script
 #
-cat >${target}/build_CE_vs90.cmd <<'ENDOFSCRIPT'
+cat >${target}/build_vs160.cmd <<'ENDOFSCRIPT'
 @echo off
-buildwin 90 build static_mt both WinCE samples
-ENDOFSCRIPT
-
-
-#
-# Create Visual C++ Express 2008 build script
-#
-cat >${target}/build_vcexpress2008.cmd <<'ENDOFSCRIPT'
-@echo off
-buildwin 90 build shared both Win32 samples vcexpress
-ENDOFSCRIPT
-
-
-#
-# Create Visual C++ Express 2010 build script
-#
-cat >${target}/build_vcexpress2010.cmd <<'ENDOFSCRIPT'
-@echo off
-buildwin 100 build shared both Win32 samples vcexpress
+buildwin 160 build shared both Win32 samples
 ENDOFSCRIPT
 
 
@@ -503,17 +428,9 @@ ENDOFSCRIPT
 # Fix line endings
 #
 if [ "$lineEndConv" != "" ] ; then
-	$lineEndConv ${target}/build_vs71.cmd
-	$lineEndConv ${target}/build_vs80.cmd
-	$lineEndConv ${target}/build_vs90.cmd
-	$lineEndConv ${target}/build_vs100.cmd
-	$lineEndConv ${target}/build_vs110.cmd
-	$lineEndConv ${target}/build_vs120.cmd
 	$lineEndConv ${target}/build_vs140.cmd
 	$lineEndConv ${target}/build_vs150.cmd
-	$lineEndConv ${target}/build_CE_vs90.cmd
-	$lineEndConv ${target}/build_vcexpress2008.cmd
-	$lineEndConv ${target}/build_vcexpress2010.cmd
+	$lineEndConv ${target}/build_vs160.cmd
 	$lineEndConv ${target}/Makefile
 	$lineEndConv ${target}/components
 fi