diff --git a/Build/for_bundle/FDS_Web_Site.url b/Build/for_bundle/FDS_Web_Site.url
deleted file mode 100644
index 00391ace6e6..00000000000
--- a/Build/for_bundle/FDS_Web_Site.url
+++ /dev/null
@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=https://pages.nist.gov/fds-smv/
diff --git a/Build/for_bundle/Modules/linux/openmpi/211_64 b/Build/for_bundle/Modules/linux/openmpi/211_64
deleted file mode 100644
index e178ab2e2bc..00000000000
--- a/Build/for_bundle/Modules/linux/openmpi/211_64
+++ /dev/null
@@ -1,45 +0,0 @@
-#%Module@VER@#####################################################################
-
-proc ModulesHelp { } {
-    global helpmsg
-    puts stderr "\t$helpmsg\n"
-}
-
-#module add library/gmp6.0.0a library/mpfr3.1.2  library/mpc1.0.3 compilers/gcc4.9.2
-
-
-# change 'mpihome' to base directory where openmpi is located
-# and all variables below will be set correctly
-
-set mpihome /shared/openmpi211_64
-
-# make sure that another openmpi or FDS6 modules are not loaded
-#
-conflict openmpi
-conflict FDS6
-
-if [ file isdirectory $mpihome/bin ] {
-    module-whatis "Sets up your openmpi environment to use $mpihome"
-    set helpmsg "Sets up your openmpi environment to use $mpihome"
-
-    setenv OPAL_PREFIX $mpihome
-
-    setenv CC $mpihome/bin/mpicc
-    setenv FC $mpihome/bin/mpif77
-    setenv F90 $mpihome/bin/mpif90
-    setenv F77 $mpihome/bin/mpif77
-
-    prepend-path PATH $mpihome/bin
-    prepend-path MANPATH $mpihome/man
-    prepend-path C_INCLUDE_PATH $mpihome/include 
-    prepend-path CPLUS_INCLUDE_PATH $mpihome/include 
-    if [ file isdirectory $mpihome/lib64 ] {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib
-    } else {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib
-    }
-} else {
-    module-whatis "MPI $mpihome is NOT installed"
-    set helpmsg "MPI $mpihome is NOT installed"
-}
-
diff --git a/Build/for_bundle/Modules/linux/openmpi/211_64ib b/Build/for_bundle/Modules/linux/openmpi/211_64ib
deleted file mode 100644
index 435ae8ea84d..00000000000
--- a/Build/for_bundle/Modules/linux/openmpi/211_64ib
+++ /dev/null
@@ -1,48 +0,0 @@
-#%Module@VER@#####################################################################
-
-proc ModulesHelp { } {
-    global helpmsg
-    puts stderr "\t$helpmsg\n"
-}
-
-#module add library/gmp6.0.0a library/mpfr3.1.2  library/mpc1.0.3 compilers/gcc4.9.2
-
-
-# change 'mpihome' to base directory where openmpi is located
-# and all variables below will be set correctly
-
-set mpihome /shared/openmpi211_64ib
-
-# make sure that another openmpi or FDS6 modules are not loaded
-#
-conflict openmpi
-conflict FDS6
-
-if [ file isdirectory $mpihome/bin ] {
-    module-whatis "Sets up your openmpi environment to use $mpihome"
-    set helpmsg "Sets up your openmpi environment to use $mpihome"
-
-    setenv OPAL_PREFIX $mpihome
-
-    setenv CC $mpihome/bin/mpicc
-    setenv FC $mpihome/bin/mpif77
-    setenv F90 $mpihome/bin/mpif90
-    setenv F77 $mpihome/bin/mpif77
-
-    prepend-path PATH $mpihome/bin
-    prepend-path MANPATH $mpihome/man
-    prepend-path C_INCLUDE_PATH $mpihome/include 
-    prepend-path CPLUS_INCLUDE_PATH $mpihome/include 
-    if [ file isdirectory $mpihome/lib64 ] {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib
-    } else {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib
-    }
-    if [ file isdirectory /usr/lib64 ] {
-	prepend-path LD_LIBRARY_PATH /usr/lib64
-    }
-} else {
-    module-whatis "MPI $mpihome is NOT installed"
-    set helpmsg "MPI $mpihome is NOT installed"
-}
-
diff --git a/Build/for_bundle/Modules/linux/openmpi/64 b/Build/for_bundle/Modules/linux/openmpi/64
deleted file mode 100644
index 509ea2dd591..00000000000
--- a/Build/for_bundle/Modules/linux/openmpi/64
+++ /dev/null
@@ -1,43 +0,0 @@
-#%Module@VER@#####################################################################
-
-proc ModulesHelp { } {
-    global helpmsg
-    puts stderr "\t$helpmsg\n"
-}
-
-#module add library/gmp6.0.0a library/mpfr3.1.2  library/mpc1.0.3 compilers/gcc4.9.2
-
-#
-# 1. change 'mpihome' to base directory: /usr/local/XXX/XXX/XXX,
-#    and all variables below will be set correctly
-#
-set mpihome /shared/openmpi_64
-
-conflict openmpi
-conflict FDS6
-
-if [ file isdirectory $mpihome/bin ] {
-    module-whatis "Sets up your openmpi environment to use $mpihome"
-    set helpmsg "Sets up your openmpi environment to use $mpihome"
-
-    setenv OPAL_PREFIX $mpihome
-
-    setenv CC $mpihome/bin/mpicc
-    setenv FC $mpihome/bin/mpif77
-    setenv F90 $mpihome/bin/mpif90
-    setenv F77 $mpihome/bin/mpif77
-
-    prepend-path PATH $mpihome/bin
-    prepend-path MANPATH $mpihome/man
-    prepend-path C_INCLUDE_PATH $mpihome/include 
-    prepend-path CPLUS_INCLUDE_PATH $mpihome/include 
-    if [ file isdirectory $mpihome/lib64 ] {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib
-    } else {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib
-    }
-} else {
-    module-whatis "MPI $mpihome is NOT installed"
-    set helpmsg "MPI $mpihome is NOT installed"
-}
-
diff --git a/Build/for_bundle/Modules/linux/openmpi/64ib b/Build/for_bundle/Modules/linux/openmpi/64ib
deleted file mode 100644
index a28d83a5562..00000000000
--- a/Build/for_bundle/Modules/linux/openmpi/64ib
+++ /dev/null
@@ -1,46 +0,0 @@
-#%Module@VER@#####################################################################
-
-proc ModulesHelp { } {
-    global helpmsg
-    puts stderr "\t$helpmsg\n"
-}
-
-#module add library/gmp6.0.0a library/mpfr3.1.2  library/mpc1.0.3 compilers/gcc4.9.2
-
-#
-# 1. change 'mpihome' to base directory: /usr/local/XXX/XXX/XXX,
-#    and all variables below will be set correctly
-#
-set mpihome /shared/openmpi_64ib
-
-conflict openmpi
-conflict FDS6
-
-if [ file isdirectory $mpihome/bin ] {
-    module-whatis "Sets up your openmpi environment to use $mpihome"
-    set helpmsg "Sets up your openmpi environment to use $mpihome"
-
-    setenv OPAL_PREFIX $mpihome
-
-    setenv CC $mpihome/bin/mpicc
-    setenv FC $mpihome/bin/mpif77
-    setenv F90 $mpihome/bin/mpif90
-    setenv F77 $mpihome/bin/mpif77
-
-    prepend-path PATH $mpihome/bin
-    prepend-path MANPATH $mpihome/man
-    prepend-path C_INCLUDE_PATH $mpihome/include 
-    prepend-path CPLUS_INCLUDE_PATH $mpihome/include 
-    if [ file isdirectory $mpihome/lib64 ] {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib
-    } else {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib
-    }
-    if [ file isdirectory /usr/lib64 ] {
-       prepend-path LD_LIBRARY_PATH /usr/lib64
-    }
-} else {
-    module-whatis "MPI $mpihome is NOT installed"
-    set helpmsg "MPI $mpihome is NOT installed"
-}
-
diff --git a/Build/for_bundle/Modules/making_modules.txt b/Build/for_bundle/Modules/making_modules.txt
deleted file mode 100644
index be7d62c2e0f..00000000000
--- a/Build/for_bundle/Modules/making_modules.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Suppose you have a script that sets environment variables.
-If you want to make a module from this script perform the
-following steps
-
-1.  env | sort > file1
-2.  run the script that sets environtment variables
-3.  env | sort > file2
-4.  ./env2mod -f file1 file2 
-5.  clean up module file named modulefile created by env2mod
-
-The program env2mod is located in the smv repo and may be built
-using scripts at smv/Build/env2mod.  
diff --git a/Build/for_bundle/Modules/osx/openmpi/202_64 b/Build/for_bundle/Modules/osx/openmpi/202_64
deleted file mode 100644
index 5359dec2e9b..00000000000
--- a/Build/for_bundle/Modules/osx/openmpi/202_64
+++ /dev/null
@@ -1,45 +0,0 @@
-#%Module@VER@#####################################################################
-
-proc ModulesHelp { } {
-    global helpmsg
-    puts stderr "\t$helpmsg\n"
-}
-
-#module add library/gmp6.0.0a library/mpfr3.1.2  library/mpc1.0.3 compilers/gcc4.9.2
-
-
-# change 'mpihome' to base directory where openmpi is located
-# and all variables below will be set correctly
-
-set mpihome /shared/openmpi202_i17_64
-
-# make sure that another openmpi or FDS6 modules are not loaded
-
-conflict openmpi
-conflict FDS6
-
-if [ file isdirectory $mpihome/bin ] {
-    module-whatis "Sets up your openmpi environment to use $mpihome"
-    set helpmsg "Sets up your openmpi environment to use $mpihome"
-
-    setenv OPAL_PREFIX $mpihome
-
-    setenv CC $mpihome/bin/mpicc
-    setenv FC $mpihome/bin/mpif77
-    setenv F90 $mpihome/bin/mpif90
-    setenv F77 $mpihome/bin/mpif77
-
-    prepend-path PATH $mpihome/bin
-    prepend-path MANPATH $mpihome/man
-    prepend-path C_INCLUDE_PATH $mpihome/include 
-    prepend-path CPLUS_INCLUDE_PATH $mpihome/include 
-    if [ file isdirectory $mpihome/lib64 ] {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib
-    } else {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib
-    }
-} else {
-    module-whatis "MPI $mpihome is NOT installed"
-    set helpmsg "MPI $mpihome is NOT installed"
-}
-
diff --git a/Build/for_bundle/Modules/osx/openmpi/211_64 b/Build/for_bundle/Modules/osx/openmpi/211_64
deleted file mode 100644
index 3cfb18445ab..00000000000
--- a/Build/for_bundle/Modules/osx/openmpi/211_64
+++ /dev/null
@@ -1,45 +0,0 @@
-#%Module@VER@#####################################################################
-
-proc ModulesHelp { } {
-    global helpmsg
-    puts stderr "\t$helpmsg\n"
-}
-
-#module add library/gmp6.0.0a library/mpfr3.1.2  library/mpc1.0.3 compilers/gcc4.9.2
-
-
-# change 'mpihome' to base directory where openmpi is located
-# and all variables below will be set correctly
-
-set mpihome /shared/openmpi211_i17u4_64
-
-# make sure that another openmpi or FDS6 modules are not loaded
-
-conflict openmpi
-conflict FDS6
-
-if [ file isdirectory $mpihome/bin ] {
-    module-whatis "Sets up your openmpi environment to use $mpihome"
-    set helpmsg "Sets up your openmpi environment to use $mpihome"
-
-    setenv OPAL_PREFIX $mpihome
-
-    setenv CC $mpihome/bin/mpicc
-    setenv FC $mpihome/bin/mpif77
-    setenv F90 $mpihome/bin/mpif90
-    setenv F77 $mpihome/bin/mpif77
-
-    prepend-path PATH $mpihome/bin
-    prepend-path MANPATH $mpihome/man
-    prepend-path C_INCLUDE_PATH $mpihome/include 
-    prepend-path CPLUS_INCLUDE_PATH $mpihome/include 
-    if [ file isdirectory $mpihome/lib64 ] {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib
-    } else {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib
-    }
-} else {
-    module-whatis "MPI $mpihome is NOT installed"
-    set helpmsg "MPI $mpihome is NOT installed"
-}
-
diff --git a/Build/for_bundle/Modules/osx/openmpi/64 b/Build/for_bundle/Modules/osx/openmpi/64
deleted file mode 100644
index 509ea2dd591..00000000000
--- a/Build/for_bundle/Modules/osx/openmpi/64
+++ /dev/null
@@ -1,43 +0,0 @@
-#%Module@VER@#####################################################################
-
-proc ModulesHelp { } {
-    global helpmsg
-    puts stderr "\t$helpmsg\n"
-}
-
-#module add library/gmp6.0.0a library/mpfr3.1.2  library/mpc1.0.3 compilers/gcc4.9.2
-
-#
-# 1. change 'mpihome' to base directory: /usr/local/XXX/XXX/XXX,
-#    and all variables below will be set correctly
-#
-set mpihome /shared/openmpi_64
-
-conflict openmpi
-conflict FDS6
-
-if [ file isdirectory $mpihome/bin ] {
-    module-whatis "Sets up your openmpi environment to use $mpihome"
-    set helpmsg "Sets up your openmpi environment to use $mpihome"
-
-    setenv OPAL_PREFIX $mpihome
-
-    setenv CC $mpihome/bin/mpicc
-    setenv FC $mpihome/bin/mpif77
-    setenv F90 $mpihome/bin/mpif90
-    setenv F77 $mpihome/bin/mpif77
-
-    prepend-path PATH $mpihome/bin
-    prepend-path MANPATH $mpihome/man
-    prepend-path C_INCLUDE_PATH $mpihome/include 
-    prepend-path CPLUS_INCLUDE_PATH $mpihome/include 
-    if [ file isdirectory $mpihome/lib64 ] {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib64:$mpihome/lib
-    } else {
-	prepend-path LD_LIBRARY_PATH $mpihome/lib
-    }
-} else {
-    module-whatis "MPI $mpihome is NOT installed"
-    set helpmsg "MPI $mpihome is NOT installed"
-}
-
diff --git a/Build/for_bundle/Overview.html b/Build/for_bundle/Overview.html
deleted file mode 100644
index 513ec91553c..00000000000
--- a/Build/for_bundle/Overview.html
+++ /dev/null
@@ -1,54 +0,0 @@
- <html>
-
-<head>
-<TITLE>FDS and Smokeview Overview</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" >
-<h2>FDS and Smokeview Overview</h2>
-<p><hr size="1">
-<p>
-
-FDS is a computer program that solves equations that describe the evolution of fire. It is a Fortran program
-that reads input parameters from a text file, computes a numerical solution to the governing equations, and
-writes user-specified output data to files. Smokeview is a companion program that creates visualizations of 
-FDS generated data.
-
-<h3>FDS Documentation</h3>
-
-<ul>
-<li><a href="Guides_and_Release_Notes/FDS_User_Guide.pdf">User’s Guide for FDS</a>
-<li><a href="Guides_and_Release_Notes/FDS_Technical_Reference_Guide.pdf">Technical Reference Guide for FDS</a>
-<li><a href="Guides_and_Release_Notes/FDS_Validation_Guide.pdf">Validation Guide for FDS</a>
-<li><a href="Guides_and_Release_Notes/FDS_Verification_Guide.pdf">Verification Guide for FDS</a>
-<li><a href="Guides_and_Release_Notes/FDS_Configuration_Management_plan.pdf">Configuration Management Plan for FDS</a>
-</ul>
-
-<h3>Smokeview Documentation</h3>
-<ul>
-<li><a href="Guides_and_Release_Notes/SMV_User_Guide.pdf">User’s Guide for Smokeview</a>
-<li><a href="Guides_and_Release_Notes/SMV_Technical_Reference_Guide.pdf">Technical Reference Guide for Smokeview</a>
-<li><a href="Guides_and_Release_Notes/SMV_Verification_Guide.pdf">Verification Guide for Smokeview</a>
-</ul>
-
-<h3>Updates</h3>
-<ul>
-<li><a href="https://pages.nist.gov/fds-smv/downloads.html">Software updates</a> 
-<li><a href="https://pages.nist.gov/fds-smv/manuals.html">Manuals</a> 
-</ul>
-
-<h3>User Support</h3>
-The FDS-Smokeview discussion group exists so that users may discuss fire phenomena related to FDS/Smokeview scenarios.
-Similar to the discussion group, is the Issue Tracker which was set up to report problems and to request enhancements.
-When reporting a problem to the Issue Tracker, it is important to simplify your case as much as possible and still exhibit the problem.
-The Discussion group and Issue tracker are available at
-<ul>
-<li><a href="https://groups.google.com/forum/#!forum/fds-smv">FDS-SMV/Discussion Group</a> 
-<li><a href="https://github.com/firemodels/fds/issues">Issue Tracker</a> 
-</ul>
-
-
-
-<hr>
-
-</BODY>
-</HTML>
diff --git a/Build/for_bundle/Overview_linux_osx.html b/Build/for_bundle/Overview_linux_osx.html
deleted file mode 100644
index 920ddfe385d..00000000000
--- a/Build/for_bundle/Overview_linux_osx.html
+++ /dev/null
@@ -1,46 +0,0 @@
- <html>
-
-<head>
-<TITLE>FDS and Smokeview Overview</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" >
-<h2>FDS and Smokeview Overview</h2>
-<p><hr size="1">
-<p>
-
-FDS is a computer program that solves equations that describe the evolution of fire. It is a Fortran program
-that reads input parameters from a text file, computes a numerical solution to the governing equations, and
-writes user-specified output data to files. Smokeview is a companion program that reads FDS output files
-and produces animations on the computer screen.
-
-<h3>Documentation</h3>
-
-<ul>
-<li><a href="FDS_User_Guide.pdf">User’s Guide for FDS</a>
-<li><a href="SMV_User_Guide.pdf">User’s Guide for Smokeview</a>
-<li><a href="FDS_Technical_Reference_Guide.pdf">Technical Reference Guide for FDS</a>
-<li><a href="SMV_Technical_Reference_Guide.pdf">Technical Reference Guide for Smokeview</a>
-</ul>
-
-<h3>Updates</h3>
-<ul>
-<li><a href="https://pages.nist.gov/fds-smv/downloads.html">Software updates</a> 
-<li><a href="https://pages.nist.gov/fds-smv/manuals.html">Documentation updates</a> 
-</ul>
-
-<h3>User Support</h3>
-The FDS-Smokeview discussion group exists so that users may discuss fire phenomena related to FDS/Smokeview scenarios.
-Similar to the discussion group, is the Issue Tracker which was set up to report problems and to request enhancements.
-When reporting a problem to the ISsue Tracker, it is important to simplify your case as much as possible and still exhibit the problem.
-The Discussion group and Issue tracker are available at
-<ul>
-<li><a href="https://groups.google.com/forum/#!forum/fds-smv">Discussion Group</a> 
-<li><a href="https://github.com/firemodels/fds/issues">Issue Tracker</a> 
-</ul>
-
-
-
-<hr>
-
-</BODY>
-</HTML>
diff --git a/Build/for_bundle/about.txt b/Build/for_bundle/about.txt
deleted file mode 100644
index 1f3d3adf62e..00000000000
--- a/Build/for_bundle/about.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-The Fire Dynamics Simulator (FDS), is a computational
-fluid dynamics (CFD) model of fire-driven fluid flow. 
-
-Smokeview is a separate visualization program that is used to display the
-results of an FDS simulation.
\ No newline at end of file
diff --git a/Build/for_bundle/fds_local.bat b/Build/for_bundle/fds_local.bat
deleted file mode 100644
index 8ca235cbbc9..00000000000
--- a/Build/for_bundle/fds_local.bat
+++ /dev/null
@@ -1,215 +0,0 @@
-@echo off
-
-if NOT "x%1%" == "x" goto skip_usage
-  call :usage
-  exit /b
-:skip_usage
-
-set n_mpi=1
-set n_openmp=1
-set show_only=0
-set stop_script=0
-set use_openmp=0
-set force_openmp=0
-set have_casename=0
-set show_version=0
-set MPIEXEC_PORT_RANGE=
-set MPICH_PORT_RANGE=
-set debug=
-set oversubscribed=
-set casedir=
-set use_default_casedir=
-set "fabric="
-
-
-call :getopts %*
-if "%stop_script%" == "1" exit /b
-call :set_openmp_defaults
-
-if "x%IN_CMDFDS%" == "x1" goto skip_fdsinit
-  echo setting up environment for fds
-  call fdsinit
-:skip_fdsinit
-
-if "x%IN_CMDFDS%" == "x1" goto skip_NO_IN_CMDFDS
-  echo ***Error: environment not setup for using fds
-  echo type: fdsinit or use the CMDfds command shell
-  exit /b
-:skip_NO_IN_CMDFDS
-
-if "%show_version%" == "0" goto skip_showversion
-  mpiexec -localonly -n 1 fds
-goto eof
-:skip_showversion
-
-if "%have_casename%" == "1" goto skip_casename_test
-  echo ***error: an input file is missing
-  call :usage
-  echo .
-  if "%show_only%" == "1" goto skip_casename_test
-  exit /b
-:skip_casename_test
-
-set ECHO=
-if "%show_only%" == "1" set ECHO=echo
-
-if "%show_only%" == "1" goto skip1
-if "x%use_default_casedir%" == "x" goto skip3
-  set casedir=%casename:~0,-4%
-:skip3
-if "x%casedir%" == "x" goto skip2
-if NOT exist %casedir% mkdir %casedir%
-  echo @echo off            > %casedir%.bat
-  echo smokeview %casedir% >> %casedir%.bat
-  copy %casename% %casedir%
-  cd %casedir%
-:skip2
-:skip1
-
-:: placeholder names for openmp and non-openmp versions of fds
-
-set fds_openmp=fds_openmp
-set fds_non_openmp=fds
-
-set fds=%fds_openmp%
-set "openmp_env=-env OMP_NUM_THREADS %n_openmp%"
-
-:: use non-openmp fds if number of threads is 1 and openmp is not being forced
-
-if NOT "%n_openmp%" == "1" goto skip1
-if "%force_openmp%" == "1" goto skip1
-  set fds=%fds_non_openmp%
-  set openmp_env=
-:skip1
-
-TITLE %casename%
-%ECHO% mpiexec -localonly -n %n_mpi% %openmp_env% %debug% %oversubscribed% %fabric% %fds% %casename%
-
-:eof
-exit /b
-
-:-------------------------------------------------------------------------
-:----------------------subroutines----------------------------------------
-:-------------------------------------------------------------------------
-
-:-------------------------------------------------------------------------
-:getopts
-:-------------------------------------------------------------------------
- if (%1)==() exit /b
-
- set casename=%1
- set case1=%casename:~0,1%
- if "%case1%" == "-" goto skip_casename
-
-   set have_casename=1
-   if EXIST %casename% goto skip_casename_notexist
-   if "%show_only%" == "1" goto skip_casename_notexist
-      echo ***error: The input file %casename% does not exist
-      set stop_script=1
-
- :skip_casename_notexist
- exit /b
-
- :skip_casename
- set valid=0
- set arg=%1
- if /I "%1" EQU "-p" (
-   set valid=1
-   set n_mpi=%2
-   shift
- )
- if /I "%1" EQU "-c" (
-   set valid=1
-   set show_only=1
- )
- if /I "%1" EQU "-v" (
-   set valid=1
-   set show_version=1
- )
- if /I "%1" EQU "-d" (
-   set valid=1
-   set "debug=-env I_MPI_DEBUG=5"
- )
- if /I "%1" EQU "-F" (
-   set valid=1
-   set "fabric=-env I_MPI_FABRICS=%2"
-   shift
- )
- if /I "%1" EQU "-h" (
-   set valid=1
-   set stop_script=1
-   call :usage
-   exit /b
- )
- if "%1" EQU "-o" (
-   set valid=1
-   set n_openmp=%2
-   set use_openmp=1
-   shift
- )
- if "%1" EQU "-f" (
-   set valid=1
-   set force_openmp=1
- )
- if "%1" EQU "-y" (
-   set valid=1
-   set casedir=%2
-   shift
- )
- if "%1" EQU "-Y" (
-   set valid=1
-   set use_default_casedir=1
- )
- if "%1" EQU "-O" (
-   set valid=1
-   set "oversubscribed=-env I_MPI_WAIT_MODE=1"
- )
- shift
- if %valid% == 0 (
-   echo.
-   echo ***Error: the input argument %arg% is invalid
-   echo.
-   echo Usage:
-   call :usage
-   set stop_script=1
-   exit /b
- )
-if not (%1)==() goto getopts
-exit /b
-
-:-------------------------------------------------------------------------
-:set_openmp_defaults
-:-------------------------------------------------------------------------
-:: if number of openmp threads are not specified then
-:: set number of openmp threads to 1 if number of mpi processes > 1
-:: set number of openmp threads to %OMP_NUM_THREADS% if number of mpi processes = 1
-
-if "%use_openmp%" == "1" exit /b
-if "%n_mpi%" == "1" set n_openmp=%OMP_NUM_THREADS%
-if "%n_mpi%" == "1" exit /b
-set n_openmp=1
-exit /b
-
-:-------------------------------------------------------------------------
-:usage  
-:-------------------------------------------------------------------------
-echo.
-echo Usage:
-echo fds_local  [options] casename.fds
-echo.
-echo options:
-echo -c     - show command line generated by this script (fds is not run)
-echo -d     - add -env I_MPI_DEBUG=5 to the mpiexec line for debugging
-echo -f     - force the openmp version of fds to be used even if the number of threads is 1
-echo -F fabric - set I_MPI_FABRICS fabric variable
-echo -h     - display this message
-echo -p xx  - number of MPI processes [default: 1]
-echo -o yy  - number of OpenMP threads per process [default: %OMP_NUM_THREADS% ]
-echo          fds_local uses the non-OpenMP version of fds if the number of OpenMP threads
-echo          specified per process is 1 unless the -f option is also specified
-echo -O     - add -env I_MPI_WAIT=1 to the mpiexec line for use when your case is oversubscribed
-echo -v     - show fds version information
-echo -y dir - run casename.fds in directory dir
-echo -Y     - run casename.fds in directory casename
-
-exit /b
diff --git a/Build/for_bundle/fdsinit.bat b/Build/for_bundle/fdsinit.bat
deleted file mode 100644
index 989e1bdef2d..00000000000
--- a/Build/for_bundle/fdsinit.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-set I_MPI_ROOT=%~dp0\mpi
-set PATH=%I_MPI_ROOT%;%PATH%
-set IN_CMDFDS=1
-set MPIEXEC_PORT_RANGE=
-set MPICH_PORT_RANGE=
-
-title FDS
-echo.
-echo type helpfds for help on running fds
-
diff --git a/Build/for_bundle/fdspath.bat b/Build/for_bundle/fdspath.bat
deleted file mode 100644
index 6ce819cb297..00000000000
--- a/Build/for_bundle/fdspath.bat
+++ /dev/null
@@ -1,43 +0,0 @@
-@echo off
-set CURDIR=%CD%
-
-if "x%FDS_SAVE_PATH%" == "x" goto set_fds_path
-:: restore original path
-
-echo restoring original path
-set PATH=%FDS_SAVE_PATH%
-echo.
-echo PATH=%PATH%
-set FDS_SAVE_PATH=
-echo.
-echo original path restored
-
-goto eof
-
-:set_fds_path
-
-:: set path containing fds, smokeview, intel mpi and windows entries
-
-SET I_MPI_ROOT=%~dp0\mpi
-SET FDS_PATH=%~dp0
-SET SMV_PATH=%~dp0\..\..\SMV6
-
-cd %I_MPI_ROOT%
-SET I_MPI_ROOT=%CD%
-
-cd %FDS_PATH%
-SET FDS_PATH=%CD%
-
-cd %SMV_PATH%
-SET SMV_PATH=%CD%
-
-SET FDS_SAVE_PATH=%PATH%
-echo setting path to contain only fds, smokeview, intel mpi and windows entries
-echo type fdspath again to restore original path
-SET PATH=%SMV_PATH%;%FDS_PATH%;%I_MPI_ROOT%;%WINDIR%;%WINDIR%\system32
-echo.
-echo PATH=%PATH%
-
-:eof
-
-cd %CURDIR%
diff --git a/Build/for_bundle/helpfds.bat b/Build/for_bundle/helpfds.bat
deleted file mode 100644
index c66f025b89e..00000000000
--- a/Build/for_bundle/helpfds.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-fds -v
-echo Current number of OpenMP threads per MPI process:
-echo OMP_NUM_THREADS=%OMP_NUM_THREADS%
-echo.
-echo To run fds, open the command shell CMDfds located on the desktop.
-echo.
-echo To run fds for cases using this computer only:
-echo fds_local -p xx -o yy casename.fds
-echo.
-echo For more options type: fds_local -h
-echo.
-echo To run fds for cases using multiple computers:
-echo mpiexec -n xx -hostfile hostfile.txt -wdir WDIR -env OMP_NUM_THREADS yy fds casename.fds
-echo.
-echo    xx -- number of MPI processes requested 
-echo    yy -- number of OpenMP threads requested per MPI process
-echo    hostfile.txt -- list of available computers
-echo    WDIR -- Network address of the working directory
-echo.
-
diff --git a/Build/for_bundle/icon.ico b/Build/for_bundle/icon.ico
deleted file mode 100644
index d8dfc51c751..00000000000
Binary files a/Build/for_bundle/icon.ico and /dev/null differ
diff --git a/Build/for_bundle/setup.bat b/Build/for_bundle/setup.bat
deleted file mode 100644
index 1efd368e6e7..00000000000
--- a/Build/for_bundle/setup.bat
+++ /dev/null
@@ -1,534 +0,0 @@
-@echo off
-set script_dir=%~dp0
-
-title FDS and Smokeview Installer for %username% with home directory %userprofile%
-
-:: before we do anything make sure this is a 64 bit PC
-
-if defined PROGRAMFILES(X86) (
-  echo.
-) else (
-  echo.
-  echo *** Fatal error: 32 bit Windows detected.
-  echo     FDS and Smokeview can only run on 64 bit systems.
-  echo     Installation aborted.
-  echo *** Press any key to continue.    ***
-  pause>NUL
-  goto abort
-)
-
-:: form extraction directory
-
-set /p basename=<firemodels\basename.txt
-set EXTRACTDIR=%userprofile%\%basename%
-for /f "tokens=* delims= " %%A in ('echo %EXTRACTDIR% ') do set EXTRACTDIR=%%A
-set EXTRACTDIR=%EXTRACTDIR:~0,-1%
-
-:quest1
-set auto_install=y
-type firemodels\message.txt
-echo.
-echo Install in %SystemDrive%\Program Files\firemodels and stop any 
-echo instances of fds, smokeview, mpiexec, and/or hydra_service?
-echo.
-echo  yes - standard installation (use default answer for all questions)
-echo   no - customize installation (install to a different location)
-::echo extract - extract to: %EXTRACTDIR%
-::echo           and quit 
-echo quit - stop installation
-echo.
-set /p  auto_install="yes, no or quit?:"
-call :get_yesnoextract %auto_install% auto_install quest1_repeat
-if "%quest1_repeat%" == "1" goto quest1
-if "%quest1_repeat%" == "2" goto abort
-if "%quest1_repeat%" == "3" goto extract
-
-::*** check if fds and smokeview are running
-
-:begin
-set progs_running=0
-call :count_programs
-
-if "%progs_running%" == "0" goto start
-  if "%auto_install%" == "y" goto skip_remove
-  echo The following program(s) need to be stopped before proceeding with the installation:
-  echo %fds_string% %smokeview_string% %mpiexec_string% %hydra_service_string%
-  echo.
-  echo Options:
-  echo   Press 1 to stop these programs (default: 1) 
-  echo   Press any other key to quit installation
-  :skip_remove
-
-  set option=1
-  if "%auto_install%" == "n" set /p  option="Option:"
-  if "%option%" == "1" (
-    call :stop_programs
-    goto start
-  )
-  goto abort
-
-::*** determine install directory
-
-:start
-
-if "%auto_install%" == "y" goto skip_loc
-echo.
-type firemodels\message.txt
-echo.
-echo Options:
-echo    Press 1 to install for all users (default: 1)
-echo    Press 2 to install for user %USERNAME%
-echo    Press any other key to cancel the installation
-:skip_loc
-
-set option=1
-if "%auto_install%" == "n" set /p option="Option:"
-
-set option_install=0
-if "%option%" == "1" set option_install=1
-if "%option%" == "2" set option_install=2
-if "%option_install%" == "0" goto abort
-
-set "BASEDIR=%SystemDrive%\Program Files"
-if "%option_install%" == "2" set "BASEDIR=%userprofile%"
-
-set subdir=firemodels
-set "INSTALLDIR=%BASEDIR%\%subdir%"
-echo.
-if "%auto_install%" == "n" set /p INSTALLDIR="Enter FDS/Smokeview root directory (default: %INSTALLDIR%):"
-
-::*** start installation of FDS and Smokeview
-
-:install
-
-echo.
-echo Installation directory: %INSTALLDIR%
-echo.
-
-set "SMV6=%INSTALLDIR%\SMV6"
-set "FDS6=%INSTALLDIR%\FDS6"
-set "CFAST=%INSTALLDIR%\cfast"
-
-set need_overwrite=0
-if EXIST "%FDS6%" set need_overwrite=1 
-if EXIST "%SMV6%" set need_overwrite=1
-
-:quest2
-if "%need_overwrite%" == "0" goto else1 
-  if "%auto_install%" == "n" echo The directories %subdir%\FDS6 and/or %subdir%\SMV6 exist. 
-  set option=n
-  if "%auto_install%" == "y" set option=y 
-  if "%auto_install%" == "n" set /p option="Do you wish to overwrite them? (yes, no (default: no)):"
-  goto endif1
-:else1
-  set option=y
-  if "%auto_install%" == "n" set /p option="Do you wish to proceed? (yes, no, (default: yes)):"
-:endif1
-
-set option=%option:~0,1%
-call :get_yesno %option% option quest2_repeat
-if "%quest2_repeat%" == "1" goto quest2
-
-if "x%option%" == "xy" goto proceed
-goto begin
-
-:proceed
-
-set "DOCDIR=%INSTALLDIR%\FDS6\Documentation"
-set "UNINSTALLDIR=%INSTALLDIR%\FDS6\Uninstall"
- 
-if NOT exist "%FDS6%" goto skip_remove_fds6
-echo *** Removing %FDS6%
-rmdir /S /Q "%FDS6%"
-:skip_remove_fds6
-
-if NOT exist "%SMV6%" goto skip_remove_smv6
-echo *** Removing %SMV6%
-rmdir /S /Q "%SMV6%"
-:skip_remove_smv6
-
-:: copy files to new installation
-
-echo.
-echo *** Copying installation files to %INSTALLDIR%
-if NOT EXIST "%INSTALLDIR%" mkdir "%INSTALLDIR%" > Nul
-
-set "LOGFILE=%INSTALLDIR%\fds_install.log"
-echo FDS/Smokeview installation log         > "%LOGFILE%"
-
-echo.                                      >> "%LOGFILE%"
-echo *** Copying fds files                     >> "%LOGFILE%"
-xcopy /E /I /H /Q firemodels\FDS6 "%FDS6%" >> "%LOGFILE%"
-
-echo.                                      >> "%LOGFILE%"
-echo *** Copying smokeview files               >> "%LOGFILE%"
-xcopy /E /I /H /Q firemodels\SMV6 "%SMV6%" >> "%LOGFILE%"
-
-set "filepath=%FDS6%\bin\fds.exe%"
-call :is_file_copied fds.exe
-
-set "filepath=%SMV6%\smokeview.exe"
-call :is_file_copied smokeview.exe
-
-set "filepath=%FDS6%\bin\mpi\mpiexec.exe"
-call :is_file_copied mpiexec.exe
-
-echo        copy complete
-
-echo *** Removing previous FDS/Smokeview entries from the system and user path.
-echo.                                                                           >> "%LOGFILE%"
-echo *** Removing previous FDS/Smokeview entries from the system and user path. >> "%LOGFILE%"
-call "%UNINSTALLDIR%\set_path.exe" -s -m -b -r "nist\fds"        >> "%LOGFILE%"
-call "%UNINSTALLDIR%\set_path.exe" -u -m -b -r "FDS\FDS5"        >> "%LOGFILE%"
-call "%UNINSTALLDIR%\set_path.exe" -s -m -b -r "FDS\FDS5"        >> "%LOGFILE%"
-call "%UNINSTALLDIR%\set_path.exe" -u -m -b -r "FDS\FDS6"        >> "%LOGFILE%"
-call "%UNINSTALLDIR%\set_path.exe" -s -m -b -r "FDS\FDS6"        >> "%LOGFILE%"
-call "%UNINSTALLDIR%\set_path.exe" -s -m -b -r "firemodels\FDS6" >> "%LOGFILE%"
-call "%UNINSTALLDIR%\set_path.exe" -s -m -b -r "firemodels\SMV6" >> "%LOGFILE%"
-call "%UNINSTALLDIR%\set_path.exe" -u -m -b -r "firemodels\FDS6" >> "%LOGFILE%"
-call "%UNINSTALLDIR%\set_path.exe" -u -m -b -r "firemodels\SMV6" >> "%LOGFILE%"
-
-:: ------------ create aliases ----------------
-
-set numcoresfile="%TEMP%\numcoresfile"
-
-:: ------------ setting up path ------------
-
-echo *** Setting up PATH variable.
-
-echo.                                                       >> "%LOGFILE%"
-echo *** Setting up PATH variable                           >> "%LOGFILE%"
-if NOT "%option_install%" == "1" goto skip_systempath
-  call "%UNINSTALLDIR%\set_path.exe" -s -m -f "%FDS6%\bin"  >> "%LOGFILE%"
-  call "%UNINSTALLDIR%\set_path.exe" -s -m -f "%SMV6%"      >> "%LOGFILE%"
-  goto after_setpath
-:skip_systempath
-
-call "%UNINSTALLDIR%\set_path.exe" -u -m -f "%FDS6%\bin" >> "%LOGFILE%"
-call "%UNINSTALLDIR%\set_path.exe" -u -m -f "%SMV6%"      >> "%LOGFILE%"
-
-:after_setpath
-
-:: ------------- file association -------------
-echo *** Associating the .smv file extension with smokeview.exe
-
-echo.                                                           >> "%LOGFILE%"
-echo *** Associating the .smv file extension with smokeview.exe >> "%LOGFILE%"
-ftype smvDoc="%SMV6%\smokeview.exe" "%%1"                       >> "%LOGFILE%"
-assoc .smv=smvDoc                                               >> "%LOGFILE%"
-
-if exist "%Programdata%\Microsoft\Windows\Start Menu\Programs" set "FDSSTART=%Programdata%\Microsoft\Windows\Start Menu\Programs\FDS6"
-if exist "%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs" set "FDSSTART=%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\FDS6"
-:: ------------- start menu shortcuts ---------------
-echo *** Adding document shortcuts to %FDSSTART% .
-if exist "%FDSSTART%" rmdir /q /s "%FDSSTART%"
-
-mkdir "%FDSSTART%"
-
-echo.                              >> "%LOGFILE%"
-echo *** Setting up shortcuts/urls >> "%LOGFILE%"
-call :copy_url "%DOCDIR%\FDS_on_the_Web\Official_Web_Site.url"     "%FDSSTART%\FDS Home Page.url"
-
-call :setup_shortcut "%FDSSTART%\FDS Config Management Plan.lnk"          "%DOCDIR%\Guides_and_Release_Notes\FDS_Config_Management_Plan.pdf"
-call :setup_shortcut "%FDSSTART%\FDS User Guide.lnk"                      "%DOCDIR%\Guides_and_Release_Notes\FDS_User_Guide.pdf"
-call :setup_shortcut "%FDSSTART%\FDS Technical Reference Guide.lnk"       "%DOCDIR%\Guides_and_Release_Notes\FDS_Technical_Reference_Guide.pdf"
-call :setup_shortcut "%FDSSTART%\FDS Validation Guide.lnk"                "%DOCDIR%\Guides_and_Release_Notes\FDS_Validation_Guide.pdf"  
-call :setup_shortcut "%FDSSTART%\FDS Verification Guide.lnk"              "%DOCDIR%\Guides_and_Release_Notes\FDS_Verification_Guide.pdf"
-call :setup_shortcut "%FDSSTART%\FDS Release Notes.lnk"                   "%DOCDIR%\Guides_and_Release_Notes\FDS_Release_Notes.htm"
-call :setup_shortcut "%FDSSTART%\Smokeview User Guide.lnk"                "%DOCDIR%\Guides_and_Release_Notes\SMV_User_Guide.pdf"
-call :setup_shortcut "%FDSSTART%\Smokeview Technical Reference Guide.lnk" "%DOCDIR%\Guides_and_Release_Notes\SMV_Technical_Reference_Guide.pdf"
-call :setup_shortcut "%FDSSTART%\Smokeview Verification Guide.lnk"        "%DOCDIR%\Guides_and_Release_Notes\SMV_Verification_Guide.pdf"
-call :setup_shortcut "%FDSSTART%\Smokeview release notes.lnk"             "%DOCDIR%\Guides_and_Release_Notes\Smokeview_release_notes.html"
-call :setup_shortcut "%FDSSTART%\Uninstall.lnk"                           "%UNINSTALLDIR%\uninstall.bat"
-
-set "DESKTOPDIR=%userprofile%\Desktop"
-set "DESKTOPDIR11=%OneDrive%\Desktop"
-
-                          call :setup_cmdfds "%FDSSTART%\CMDfds.lnk"
-if exist "%DESKTOPDIR%"   call :setup_cmdfds "%DESKTOPDIR%\CMDfds.lnk"
-if exist "%DESKTOPDIR11%" call :setup_cmdfds "%DESKTOPDIR11%\CMDfds.lnk"
-set cmdexist=0
-if exist "%DESKTOPDIR%\CMDfds.lnk"   set cmdexist=1
-if exist "%DESKTOPDIR11%\CMDfds.lnk" set cmdexist=1
-if "%cmdexist%" == "0" echo ***error: CMDfds failed to be copied to the desktop
-
-:: ----------- setting up openmp threads environment variable
-
-::WMIC CPU Get NumberofLogicalProcessors | more /E +1 > %numcoresfile%
-set ncores=1
-if "x%NUMBER_OF_PROCESSORS%" == "x" goto endif1
-  echo %NUMBER_OF_PROCESSORS% > %numcoresfile%
-:endif1
-
-set /p ncores=<%numcoresfile%
-
-if %ncores% GEQ 8 (
-  set nthreads=4
-) else (
-  if %ncores% GEQ 4 (
-    set nthreads=2
-  ) else (
-    set nthreads=1 
-  )
-)
-
-echo.                                            >> "%LOGFILE%"
-echo *** Setting up the OMP_NUM_THREADS variable >> "%LOGFILE%"
-setx -m OMP_NUM_THREADS %nthreads%               >> "%LOGFILE%"
-
-:: ----------- setting up firewall for mpi version of FDS
-
-:: remove smpd and hydra
-
-echo.                   >> "%LOGFILE%"
-echo *** Removing smpd  >> "%LOGFILE%"
-smpd -remove          1>> Nul 2>&1
-echo.                   >> "%LOGFILE%"
-echo *** Removing hydra >> "%LOGFILE%"
-hydra_service -remove 1>> Nul 2>&1
-
-echo.                                    >> "%LOGFILE%"
-echo *** Setting up firewall exceptions. >> "%LOGFILE%"
-echo *** Setting up firewall exceptions.
-set "firewall_setup=%FDS6%\setup_fds_firewall.bat"
-call "%firewall_setup%" "%FDS6%\bin\mpi"
-
-:: ----------- setting up uninstall file
-
-echo.                                     >> "%LOGFILE%"
-echo *** Setting up the Uninstall script. >> "%LOGFILE%"
-echo *** Setting up the Uninstall script.
-
-:: remove smokeview path and directory
-
-echo if "%%cfastinstalled%%" == "1" goto skip2                >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo echo Removing "%SMV6%" from the System Path              >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo call "%UNINSTALLDIR%\set_path.exe" -s -b -r %SMV6%       >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo rmdir /s /q "%SMV6%"                                     >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo :skip2                                                   >> "%UNINSTALLDIR%\uninstall_base.bat"
-
-echo echo Removing CMDfds desktop shortcut                                   >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo if exist "%DESKTOPDIR%\CMDfds.lnk"   erase "%DESKTOPDIR%\CMDfds.lnk"    >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo if exist "%DESKTOPDIR11%\CMDfds.lnk" erase "%DESKTOPDIR11%\CMDfds.lnk"  >> "%UNINSTALLDIR%\uninstall_base.bat"
-
-:: remove FDS path and directory
-
-echo echo Removing "%FDS6%\bin" from the System Path          >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo call "%UNINSTALLDIR%\set_path.exe" -s -b -r "%FDS6%\bin" >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo echo.                                                    >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo echo Removing "%FDS6%"                                   >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo rmdir /s /q  "%FDS6%"                                    >> "%UNINSTALLDIR%\uninstall_base.bat"
-
-:: if cfast exists then only remove fds
-:: if cfast does not exist then remove everything
-
-echo if exist "%CFAST%" goto skip_remove                      >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo   echo Removing "%SMV6%"                                 >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo   rmdir /s /q  "%SMV6%"                                  >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo   echo Removing "%INSTALLDIR%"                           >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo   rmdir "%INSTALLDIR%"                                   >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo :skip_remove                                             >> "%UNINSTALLDIR%\uninstall_base.bat"
-
-echo echo *** Uninstall complete                              >> "%UNINSTALLDIR%\uninstall_base.bat"
-
-type  "%UNINSTALLDIR%\uninstall_base2.bat"                    >> "%UNINSTALLDIR%\uninstall_base.bat"
-echo pause>Nul                                                >> "%UNINSTALLDIR%\uninstall_base.bat"
-erase "%UNINSTALLDIR%\uninstall_base2.bat"
-
-echo "%UNINSTALLDIR%\uninstall.vbs"                           >> "%UNINSTALLDIR%\uninstall.bat"
-echo echo Uninstall complete                                  >> "%UNINSTALLDIR%\uninstall.bat"
-echo pause                                                    >> "%UNINSTALLDIR%\uninstall.bat"
-
-set "ELEVATE_APP=%UNINSTALLDIR%\uninstall_base.bat"
-set ELEVATE_PARMS=
-echo Set objShell = CreateObject("Shell.Application")                       > "%UNINSTALLDIR%\uninstall.vbs"
-echo Set objWshShell = WScript.CreateObject("WScript.Shell")               >> "%UNINSTALLDIR%\uninstall.vbs"
-echo Set objWshProcessEnv = objWshShell.Environment("PROCESS")             >> "%UNINSTALLDIR%\uninstall.vbs"
-echo objShell.ShellExecute "%ELEVATE_APP%", "%ELEVATE_PARMS%", "", "runas" >> "%UNINSTALLDIR%\uninstall.vbs"
-echo WScript.Sleep 10000                                                   >> "%UNINSTALLDIR%\uninstall.vbs"
-
-echo.                                  >> "%LOGFILE%"
-echo *** Cleanup                       >> "%LOGFILE%"
-erase "%firewall_setup%"               >> "%LOGFILE%"
-erase "%FDS6%\shortcut.exe"            >> "%LOGFILE%"
-
-echo.
-echo To run fds for cases using this computer only, open the
-echo command shell CMDfds (located on the desktop) and type:
-echo.
-echo fds_local casename.fds
-echo.
-echo where casename is the name of your case. For more information type: helpfds.
-echo. 
-echo *** Press any key, then reboot to complete the installation.  ***
-pause>NUL
-goto eof
-
-:-------------------------------------------------------------------------
-:----------------------subroutines----------------------------------------
-:-------------------------------------------------------------------------
-
-:: -------------------------------------------------------------
-:is_file_copied
-:: -------------------------------------------------------------
-
-  set file=%1
-  if not exist "%filepath%" echo.
-  if not exist "%filepath%" echo ***error: %file% failed to copy to %filepath%
-  exit /b 0
-
-:-------------------------------------------------------------------------
-:setup_cmdfds
-:-------------------------------------------------------------------------
-set outfile=%1
-
-"%FDS6%\shortcut.exe" /F:%outfile% /T:"%COMSPEC%"   /P:"/k fdsinit" /W:"%userprofile%" /A:C > Nul
-if     exist %outfile% echo The shortcut %outfile% was created                    >> "%LOGFILE%
-if NOT exist %outfile% echo ***error: The shortcut %outfile% failed to be created >> "%LOGFILE%
-if NOT exist %outfile% echo ***error: The shortcut %outfile% failed to be created
-exit /b
-
-:-------------------------------------------------------------------------
-:setup_shortcut
-:-------------------------------------------------------------------------
-set infile=%2
-set outfile=%1
-
-"%FDS6%\shortcut.exe" /F:%outfile% /T:%infile%    /A:C  > Nul
-if     exist %outfile% echo The shortcut %outfile% was created                    >> "%LOGFILE%
-if NOT exist %outfile% echo ***error: The shortcut %outfile% failed to be created >> "%LOGFILE%
-if NOT exist %outfile% echo ***error: The shortcut %outfile% failed to be created
-
-exit /b
-
-:-------------------------------------------------------------------------
-:copy_url
-:-------------------------------------------------------------------------
-set infile=%1
-set outfile=%2
-
-copy %infile% %outfile%  
-if     exist %outfile% echo The url %outfile% was created                    >> "%LOGFILE%
-if NOT exist %outfile% echo ***error: The url %outfile% failed to be created >> "%LOGFILE%
-if NOT exist %outfile% echo ***error: The url %outfile% failed to be created
-
-exit /b
-
-:-------------------------------------------------------------------------
-:get_yesnoextract
-:-------------------------------------------------------------------------
-set answer=%1
-set answervar=%2
-set repeatvar=%3
-
-set answer=%answer:~0,1%
-if "%answer%" == "Y" set answer=y
-if "%answer%" == "N" set answer=n
-if "%answer%" == "Q" set answer=q
-if "%answer%" == "E" set answer=e
-set %answervar%=%answer%
-set repeat=1
-if "%answer%" == "y" set repeat=0
-if "%answer%" == "n" set repeat=0
-if "%answer%" == "q" set repeat=2
-if "%answer%" == "e" set repeat=3
-set %repeatvar%=%repeat%
-exit /b
-
-:-------------------------------------------------------------------------
-:get_yesno
-:-------------------------------------------------------------------------
-set answer=%1
-set answervar=%2
-set repeatvar=%3
-
-set answer=%answer:~0,1%
-if "%answer%" == "Y" set answer=y
-if "%answer%" == "N" set answer=n
-set %answervar%=%answer%
-set repeat=1
-if "%answer%" == "y" set repeat=0
-if "%answer%" == "n" set repeat=0
-set %repeatvar%=%repeat%
-exit /b
-
-:-------------------------------------------------------------------------
-:count_programs  
-:-------------------------------------------------------------------------
-call :count fds
-call :count smokeview
-call :count mpiexec
-call :count hydra_service
-exit /b
-
-:-------------------------------------------------------------------------
-:stop_programs  
-:-------------------------------------------------------------------------
-:: remove old installation
-
-if NOT "%hydra_service_count%" == "0" (
-  echo *** Stopping hydra_service
-  taskkill /F /IM hydra_service.exe >Nul 2>Nul
-)
-
-if NOT "%smokeview_count%" == "0" (
-  echo *** Stopping smokeview
-  taskkill /F /IM smokeview.exe >Nul 2>Nul
-)
-
-if NOT "%fds_count%" == "0" (
-  echo *** Stopping fds
-  taskkill /F /IM fds.exe       >Nul 2>Nul
-)
-
-if NOT "%mpiexec_count%" == "0" (
-  echo *** Stopping mpiexec
-  taskkill /F /IM mpiexec.exe   >Nul 2>Nul
-)
-exit /b
-
-:-------------------------------------------------------------------------
-:count
-:-------------------------------------------------------------------------
-set progbase=%1
-set prog=%progbase%.exe
-set countvar=%progbase%_count
-set stringvar=%progbase%_string
-
-tasklist | find /c "%prog%" > count.txt
-set /p count%=<count.txt
-erase count.txt
-
-set string=
-if NOT "%count%" == "0" set string=%progbase%
-if NOT "%count%" == "0" set progs_running=1
-
-set %countvar%=%count%
-set %stringvar%=%string%
-
-exit /b
-
-:-------------------------------------------------------------------------
-:extract
-:-------------------------------------------------------------------------
-echo.
-set "INSTALLDIR=%EXTRACTDIR%"
-set "SMV6=%INSTALLDIR%\SMV6"
-set "FDS6=%INSTALLDIR%\FDS6"
-echo *** Copying installation files to %INSTALLDIR%
-if NOT EXIST "%INSTALLDIR%" mkdir "%INSTALLDIR%" > Nul
-xcopy /E /I /H /Q firemodels\FDS6 "%FDS6%"     > Nul
-xcopy /E /I /H /Q firemodels\SMV6 "%SMV6%"     > Nul
-
-echo Copy complete
-echo Press any key to finish
-pause > Nul
-goto eof
-
-:abort
-echo FDS and Smokeview installation aborted.
-echo Press any key to finish
-pause > Nul
-
-:eof
-exit
\ No newline at end of file
diff --git a/Build/for_bundle/setup_fds_firewall.bat b/Build/for_bundle/setup_fds_firewall.bat
deleted file mode 100644
index 6d9b3a7780f..00000000000
--- a/Build/for_bundle/setup_fds_firewall.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-set bindir=%1
-:: This script deletes previous Intel MPI firewall exceptions and creates two
-:: new rules opening ports specified by the environment variable PORT_VAL.
-
-set PORT_VAL=8670-8690
-netsh advfirewall firewall delete rule name="Intel MPI Port for FDS" > Nul
-netsh advfirewall firewall add rule dir=in action=allow name="Intel MPI Port for FDS" profile=domain,private protocol=tcp localport=%PORT_VAL% > Nul
-netsh advfirewall firewall add rule dir=in action=allow name="Intel MPI Port for FDS" profile=domain,private protocol=udp localport=%PORT_VAL% > Nul
-
-:: setx -m MPIEXEC_PORT_RANGE 8670:8690 > Nul
-:: setx -m MPICH_PORT_RANGE   8670:8690 > Nul
-
-%bindir%\hydra_service -install > Nul
-
diff --git a/Build/for_bundle/temp/.gitignore b/Build/for_bundle/temp/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Build/for_bundle/uninstall.bat b/Build/for_bundle/uninstall.bat
deleted file mode 100644
index 5141616ce8e..00000000000
--- a/Build/for_bundle/uninstall.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-
-echo.
-echo *** Uninstalling FDS and Smokeview
-echo.
-echo Press any key to proceed or CTRL C to abort
-pause>NUL
diff --git a/Build/for_bundle/uninstall_fds.bat b/Build/for_bundle/uninstall_fds.bat
deleted file mode 100644
index bffaa95eef0..00000000000
--- a/Build/for_bundle/uninstall_fds.bat
+++ /dev/null
@@ -1,35 +0,0 @@
-@echo off
-
-NET SESSION >nul 2>&1
-IF %ERRORLEVEL% NEQ 0 (
-    echo *** Error: This script is running as %username%.  It must run as Administrator.
-    echo       Run again, after right clicking on this script and selecting "Run as Adminstrator"
-    echo       FDS/Smokeview uninstaller aborted.
-    pause
-    exit
-)
-
-call :is_cfast_installed
-if %cfastinstalled% == 1 goto skip1
-  echo *** Removing the association between .smv and Smokeview
-  assoc .smv=
-  ftype smvDoc=
-:skip1
-
-echo *** Removing FDS from the Start menu.
-rmdir /q /s "%ALLUSERSPROFILE%\Start Menu\Programs\FDS6"
-
-echo *** Stopping smokeview
-taskkill /F /IM smokeview.exe     >Nul 2>Nul
-
-echo *** Stopping fds
-taskkill /F /IM fds.exe           >Nul 2>Nul
-
-echo *** Stopping mpiexec
-taskkill /F /IM mpiexec.exe       >Nul 2>Nul
-
-echo *** Removing hydra_service
-taskkill /F /IM hydra_service.exe >Nul 2>Nul
-
-echo *** Removing smpd
-smpd -remove                      >Nul 2>Nul
diff --git a/Build/for_bundle/uninstall_fds2.bat b/Build/for_bundle/uninstall_fds2.bat
deleted file mode 100644
index 6a6b4b86b62..00000000000
--- a/Build/for_bundle/uninstall_fds2.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-goto eof
-
-:is_cfast_installed
-cfast 1> %temp%\file_exist.txt 2>&1
-type %temp%\file_exist.txt | find /i /c "not recognized" > %temp%\file_exist_count.txt
-set /p nothave=<%temp%\file_exist_count.txt
-set cfastinstalled=1
-if %nothave% == 1 (
-  set cfastinstalled=0
-)
-exit /b 0
-
-:eof