diff --git a/builtin_xforms/add_lib/SConstruct b/builtin_xforms/add_lib/SConstruct
deleted file mode 100644
index 7fe41a3bcc605387c2eaafceaa7e944ab0d252fb..0000000000000000000000000000000000000000
--- a/builtin_xforms/add_lib/SConstruct
+++ /dev/null
@@ -1,15 +0,0 @@
-import os
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
-
-
-pedi = Command( target = "./testoutput",
- source = "./SConscript",
- action = "cd "+os.environ['SECURITY_TRANSFORMS_HOME']+" ; " + os.environ['PEDI_HOME']+"/pedi -m manifest.txt ; cd - " )
-
-Depends(pedi,lib);
-Default(pedi)
-
diff --git a/builtin_xforms/resolve_callbacks/SConstruct b/builtin_xforms/resolve_callbacks/SConstruct
deleted file mode 100644
index c96332f0422ad5df0853931209219d9a2e20bc17..0000000000000000000000000000000000000000
--- a/builtin_xforms/resolve_callbacks/SConstruct
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
diff --git a/irdb-libs/SConstruct b/irdb-libs/SConstruct
deleted file mode 100644
index 0abcc3f52b44dd9e3ec1b5680b262758015b4231..0000000000000000000000000000000000000000
--- a/irdb-libs/SConstruct
+++ /dev/null
@@ -1,77 +0,0 @@
-import os
-import sys
-
-
-
-(sysname, nodename, release, version, machine)=os.uname()
-
-env=Environment()
-
-
-# default build options
-env.Replace(CFLAGS="-fPIC -fmax-errors=2 -Wall -Werror -fmax-errors=2")
-env.Replace(CXXFLAGS="-fPIC -fmax-errors=2 -Wall -Werror -fmax-errors=2 ")
-env.Replace(LINKFLAGS="-fPIC -fmax-errors=2 -Wall -Werror -fmax-errors=2 ")
-
-# parse arguments into env and set default values.
-env.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
-env.Replace(IRDB_SDK=os.environ['IRDB_SDK'])
-env.Replace(SMPSA_HOME=os.environ['SMPSA_HOME'])
-env.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",None))
-env.Replace(debug=ARGUMENTS.get("debug",0))
-env.Replace(build_deep=ARGUMENTS.get("build_deep", 0))
-env.Replace(build_tools=ARGUMENTS.get("build_tools", 1))
-env.Replace(build_stars=ARGUMENTS.get("build_stars", 1))
-env.Replace(build_cgc=ARGUMENTS.get("build_cgc", 0))
-
-if 'PEDI_HOME' in os.environ:
- env.Replace(PEDI_HOME=os.environ['PEDI_HOME'])
-
-env.Append(LINKFLAGS=" -Wl,-unresolved-symbols=ignore-in-shared-libs ")
-
-if int(env['debug']) == 1:
- print "Setting debug mode"
- env.Append(CFLAGS=" -g ")
- env.Append(CXXFLAGS=" -g ")
- env.Append(LINKFLAGS=" -g ")
- env.Append(SHLINKFLAGS=" -g ")
-else:
- print "Setting release mode"
- env.Append(CFLAGS=" -O3 ")
- env.Append(CXXFLAGS=" -O3 ")
- env.Append(LINKFLAGS=" -O3 ")
- env.Append(SHLINKFLAGS=" -O3 ")
-
-# set 32/64 bit build properly
-print "env[64bit]="+str(env['do_64bit_build'])
-if env['do_64bit_build'] is None:
- print 'Defaulting to default compilation size.'
-elif int(env['do_64bit_build']) == 1:
- print 'Using 64-bit compilation size.'
- env.Append(CFLAGS=" -m64 ")
- env.Append(CXXFLAGS=" -m64 ")
- env.Append(LINKFLAGS=" -m64 ")
- env.Append(SHLINKFLAGS=" -m64 ")
-else:
- print 'Using 32-bit compilation size.'
- env.Append(CFLAGS=" -m32 ")
- env.Append(CXXFLAGS=" -m32 ")
- env.Append(LINKFLAGS=" -m32 ")
- env.Append(SHLINKFLAGS=" -m32 ")
-
-
-
-# add extra flag for solaris.
-if sysname == "SunOS":
- env.Append(LINKFLAGS=" -L/opt/csw/lib -DSOLARIS ")
- env.Append(SHLINKFLAGS=" -L/opt/csw/lib -DSOLARIS ")
- env.Append(CFLAGS=" -I/opt/csw/include -DSOLARIS ")
- env.Append(CXXFLAGS=" -I/opt/csw/include -DSOLARIS ")
-
-
-Export('env')
-if int(env['build_deep']) == 1:
- SConscript("SConscript.deep")
-else:
- SConscript("SConscript")
-
diff --git a/irdb-libs/dump_insns/SConstruct b/irdb-libs/dump_insns/SConstruct
deleted file mode 100644
index 17f632b8c29cd420163897b1eb044ca3486df362..0000000000000000000000000000000000000000
--- a/irdb-libs/dump_insns/SConstruct
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-install=SConscript("SConscript")
-Return('install')
diff --git a/irdb-libs/dump_map/SConstruct b/irdb-libs/dump_map/SConstruct
deleted file mode 100644
index ac50a84a9c7d79b2716693b51594bdfbde4110e2..0000000000000000000000000000000000000000
--- a/irdb-libs/dump_map/SConstruct
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-env=Environment()
-env.Append(LINKFLAGS=" -Wl,-unresolved-symbols=ignore-in-shared-libs -L../lib")
-Export('env')
-install=SConscript("SConscript")
-
-Return('install')
diff --git a/irdb-libs/ir_builders/SConstruct b/irdb-libs/ir_builders/SConstruct
deleted file mode 100644
index b5b7b78c5f88640c7e8877a9df76dc9191af7498..0000000000000000000000000000000000000000
--- a/irdb-libs/ir_builders/SConstruct
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
-
-Return('lib')
diff --git a/irdb-libs/libEXEIO/SConstruct b/irdb-libs/libEXEIO/SConstruct
deleted file mode 100644
index b5b7b78c5f88640c7e8877a9df76dc9191af7498..0000000000000000000000000000000000000000
--- a/irdb-libs/libEXEIO/SConstruct
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
-
-Return('lib')
diff --git a/irdb-libs/libEXEIO/src/SConstruct b/irdb-libs/libEXEIO/src/SConstruct
deleted file mode 100644
index b5b7b78c5f88640c7e8877a9df76dc9191af7498..0000000000000000000000000000000000000000
--- a/irdb-libs/libEXEIO/src/SConstruct
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
-
-Return('lib')
diff --git a/irdb-libs/libIRDB-cfg/src/SConstruct b/irdb-libs/libIRDB-cfg/src/SConstruct
deleted file mode 100644
index b3bd01322f2b78089fd86e0e9b0ae01897c9c8a5..0000000000000000000000000000000000000000
--- a/irdb-libs/libIRDB-cfg/src/SConstruct
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
-Return('lib')
diff --git a/irdb-libs/libIRDB-core/src/SConstruct b/irdb-libs/libIRDB-core/src/SConstruct
deleted file mode 100644
index b2e8e0ca9b3cfeb2a49f186cdc49b783f79c5adb..0000000000000000000000000000000000000000
--- a/irdb-libs/libIRDB-core/src/SConstruct
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
-
-Return('lib')
-
diff --git a/irdb-libs/libIRDB-elfdep/SConstruct b/irdb-libs/libIRDB-elfdep/SConstruct
deleted file mode 100644
index 4d6381b5999d3e6d4e4687fc95f444ea2c4c5747..0000000000000000000000000000000000000000
--- a/irdb-libs/libIRDB-elfdep/SConstruct
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
-
-Return(lib)
diff --git a/irdb-libs/libIRDB-elfdep/src/SConstruct b/irdb-libs/libIRDB-elfdep/src/SConstruct
deleted file mode 100644
index 6c6fd8ea22a97d734ad3e4f3e5a937340c63375d..0000000000000000000000000000000000000000
--- a/irdb-libs/libIRDB-elfdep/src/SConstruct
+++ /dev/null
@@ -1,30 +0,0 @@
-import os
-import utils
-
-
-env=Environment()
-Export('env')
-
-env.Replace(debug=ARGUMENTS.get("debug",0))
-
-
-if int(env['debug']) == 1:
- print "Setting debug mode"
- env.Append(CFLAGS=" -g ")
- env.Append(CXXFLAGS=" -g ")
- env.Append(LINKFLAGS=" -g ")
-else:
- print "Setting release mode"
- env.Append(CFLAGS=" -O3 ")
- env.Append(CXXFLAGS=" -O3 ")
- env.Append(LINKFLAGS=" -O3 ")
-
-lib=SConscript("SConscript")
-
-pedi = Command( target = "./testoutput",
- source = "./SConscript",
- action = "cd "+os.environ['SECURITY_TRANSFORMS_HOME']+" ; " + os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
-
-Depends(pedi,lib);
-Default(pedi)
-
diff --git a/irdb-libs/libIRDB-syscall/src/SConstruct b/irdb-libs/libIRDB-syscall/src/SConstruct
deleted file mode 100644
index 17f632b8c29cd420163897b1eb044ca3486df362..0000000000000000000000000000000000000000
--- a/irdb-libs/libIRDB-syscall/src/SConstruct
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-install=SConscript("SConscript")
-Return('install')
diff --git a/irdb-libs/libIRDB-transform/SConstruct b/irdb-libs/libIRDB-transform/SConstruct
deleted file mode 100644
index 4d6381b5999d3e6d4e4687fc95f444ea2c4c5747..0000000000000000000000000000000000000000
--- a/irdb-libs/libIRDB-transform/SConstruct
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
-
-Return(lib)
diff --git a/irdb-libs/libIRDB-transform/src/SConstruct b/irdb-libs/libIRDB-transform/src/SConstruct
deleted file mode 100644
index c96332f0422ad5df0853931209219d9a2e20bc17..0000000000000000000000000000000000000000
--- a/irdb-libs/libIRDB-transform/src/SConstruct
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
diff --git a/irdb-libs/libIRDB-util/src/SConstruct b/irdb-libs/libIRDB-util/src/SConstruct
deleted file mode 100644
index 17f632b8c29cd420163897b1eb044ca3486df362..0000000000000000000000000000000000000000
--- a/irdb-libs/libIRDB-util/src/SConstruct
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-install=SConscript("SConscript")
-Return('install')
diff --git a/irdb-libs/libMEDSannotation/SConstruct b/irdb-libs/libMEDSannotation/SConstruct
deleted file mode 100644
index b3bd01322f2b78089fd86e0e9b0ae01897c9c8a5..0000000000000000000000000000000000000000
--- a/irdb-libs/libMEDSannotation/SConstruct
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
-Return('lib')
diff --git a/irdb-libs/libStructDiv/SConstruct b/irdb-libs/libStructDiv/SConstruct
deleted file mode 100644
index 4d6381b5999d3e6d4e4687fc95f444ea2c4c5747..0000000000000000000000000000000000000000
--- a/irdb-libs/libStructDiv/SConstruct
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
-
-Return(lib)
diff --git a/irdb-libs/libStructDiv/src/SConstruct b/irdb-libs/libStructDiv/src/SConstruct
deleted file mode 100644
index c96332f0422ad5df0853931209219d9a2e20bc17..0000000000000000000000000000000000000000
--- a/irdb-libs/libStructDiv/src/SConstruct
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-lib=SConscript("SConscript")
diff --git a/irdb-libs/meds2pdb/SConstruct b/irdb-libs/meds2pdb/SConstruct
deleted file mode 100644
index 17f632b8c29cd420163897b1eb044ca3486df362..0000000000000000000000000000000000000000
--- a/irdb-libs/meds2pdb/SConstruct
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-install=SConscript("SConscript")
-Return('install')
diff --git a/irdb-libs/rida/SConstruct b/irdb-libs/rida/SConstruct
deleted file mode 100644
index 39bd7cd0aa70be5adffc2dbe2c7b704a7274fab1..0000000000000000000000000000000000000000
--- a/irdb-libs/rida/SConstruct
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-env=Environment()
-
-env.Append(CFLAGS=" -g -Wall -Werror -std=c++14 -fmax-errors=2")
-env.Append(CXXFLAGS=" -g -Wall -Werror -std=c++14 -fmax-errors=2")
-env.Append(LINKFLAGS=" -g -Wall -Werror -std=c++14 -fmax-errors=2")
-
-Export('env')
-install=SConscript("SConscript")
-Return('install')
diff --git a/irdb-libs/thanos/SConstruct b/irdb-libs/thanos/SConstruct
deleted file mode 100644
index 44d3bd9e81dfb9812806072103183b71c0810436..0000000000000000000000000000000000000000
--- a/irdb-libs/thanos/SConstruct
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-ret=SConscript("SConscript")
-Return('ret')
diff --git a/zipr/SConstruct b/zipr/SConstruct
deleted file mode 100644
index 78796d1f77efe432c8d89540cd7835eccf183397..0000000000000000000000000000000000000000
--- a/zipr/SConstruct
+++ /dev/null
@@ -1,60 +0,0 @@
-import os
-import sys
-
-(sysname, nodename, release, version, machine)=os.uname()
-
-
-env=Environment()
-
-# default build options
-env.Replace(CFLAGS=" -fPIC ")
-env.Replace(CXXFLAGS=" -std=c++14 -fPIC ")
-env.Replace(LINKFLAGS=" -fPIC ")
-
-# parse arguments
-env.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
-env.Replace(ZIPR_HOME=os.environ['ZIPR_HOME'])
-env.Replace(ZIPR_INSTALL=os.environ['ZIPR_INSTALL'])
-env.Replace(ZIPR_SDK=os.environ['ZIPR_SDK'])
-env.Replace(profile=ARGUMENTS.get("profile",0))
-env.Replace(debug=ARGUMENTS.get("debug",0))
-env.Replace(do_cgc=ARGUMENTS.get("do_cgc",0))
-env.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",0))
-
-env.Append(LINKFLAGS=" -Wl,-unresolved-symbols=ignore-in-shared-libs ")
-
-if int(env['profile']) == 1:
- print "Setting profile and debug mode"
- env.Append(CFLAGS=" -pg")
- env.Append(CXXFLAGS=" -pg")
- env.Append(LINKFLAGS=" -pg")
- env['debug'] = 1
-if int(env['debug']) == 1:
- print "Setting debug mode"
- env.Append(CFLAGS=" -g")
- env.Append(CXXFLAGS=" -g")
- env.Append(LINKFLAGS=" -g")
-else:
- print "Setting release mode"
- env.Append(CFLAGS=" -O3")
- env.Append(CXXFLAGS=" -O3")
- env.Append(LINKFLAGS=" -O3")
-
-env['build_appfw']=0
-env['build_tools']=0
-
-# add extra flag for solaris.
-if sysname == "SunOS":
- env.Append(LINKFLAGS=" -L/opt/csw/lib -DSOLARIS ")
- env.Append(CFLAGS=" -I/opt/csw/include -DSOLARIS ")
- env.Append(CXXFLAGS=" -I/opt/csw/include -DSOLARIS ")
-else:
- env.Append(CFLAGS=" -fPIE ")
- env.Append(CXXFLAGS=" -fPIE ")
- env.Append(LINKFLAGS=" -fPIE ")
-
-
-
-Export('env')
-SConscript("SConscript")
-
diff --git a/zipr/src/SConstruct b/zipr/src/SConstruct
deleted file mode 100644
index c0dd68a00d406b0148a93709cf916ad6d05f282c..0000000000000000000000000000000000000000
--- a/zipr/src/SConstruct
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-env=Environment()
-Export('env')
-SConscript("SConscript")
diff --git a/zipr_push64_reloc_plugin/SConstruct b/zipr_push64_reloc_plugin/SConstruct
deleted file mode 100644
index 6b5cd6b97e922cc5aa24482950db5749869a4818..0000000000000000000000000000000000000000
--- a/zipr_push64_reloc_plugin/SConstruct
+++ /dev/null
@@ -1,47 +0,0 @@
-import os
-import sys
-
-(sysname, nodename, release, version, machine)=os.uname()
-
-
-
-
-env=Environment()
-
-# default build options
-env.Replace(CFLAGS="-fPIC -w ")
-env.Replace(CXXFLAGS="-fPIC -w ")
-env.Replace(LINKFLAGS="-fPIC ")
-
-# parse arguments
-env.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
-env.Replace(ZIPR_HOME=os.environ['ZIPR_HOME'])
-env.Replace(ZIPR_INSTALL=os.environ['ZIPR_INSTALL'])
-env.Replace(ZIPR_SDK=os.environ['ZIPR_SDK'])
-env.Replace(debug=ARGUMENTS.get("debug",0))
-env.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",0))
-
-
-if int(env['debug']) == 1:
- print "Setting debug mode"
- env.Append(CFLAGS=" -g")
- env.Append(CXXFLAGS=" -g")
- env.Append(LINKFLAGS=" -g")
-else:
- print "Setting release mode"
- env.Append(CFLAGS=" -O3")
- env.Append(CXXFLAGS=" -O3")
- env.Append(LINKFLAGS=" -O3")
-
-if sysname == "SunOS":
- env.Append(LINKFLAGS=" -L/opt/csw/lib -DSOLARIS ")
- env.Append(CFLAGS=" -I/opt/csw/include -DSOLARIS ")
- env.Append(CXXFLAGS=" -I/opt/csw/include -DSOLARIS ")
-
-
-env['build_appfw']=0
-env['build_tools']=0
-
-Export('env')
-SConscript("SConscript", variant_dir='build')
-
diff --git a/zipr_unpin_plugin/SConstruct b/zipr_unpin_plugin/SConstruct
deleted file mode 100644
index 6b5cd6b97e922cc5aa24482950db5749869a4818..0000000000000000000000000000000000000000
--- a/zipr_unpin_plugin/SConstruct
+++ /dev/null
@@ -1,47 +0,0 @@
-import os
-import sys
-
-(sysname, nodename, release, version, machine)=os.uname()
-
-
-
-
-env=Environment()
-
-# default build options
-env.Replace(CFLAGS="-fPIC -w ")
-env.Replace(CXXFLAGS="-fPIC -w ")
-env.Replace(LINKFLAGS="-fPIC ")
-
-# parse arguments
-env.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
-env.Replace(ZIPR_HOME=os.environ['ZIPR_HOME'])
-env.Replace(ZIPR_INSTALL=os.environ['ZIPR_INSTALL'])
-env.Replace(ZIPR_SDK=os.environ['ZIPR_SDK'])
-env.Replace(debug=ARGUMENTS.get("debug",0))
-env.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",0))
-
-
-if int(env['debug']) == 1:
- print "Setting debug mode"
- env.Append(CFLAGS=" -g")
- env.Append(CXXFLAGS=" -g")
- env.Append(LINKFLAGS=" -g")
-else:
- print "Setting release mode"
- env.Append(CFLAGS=" -O3")
- env.Append(CXXFLAGS=" -O3")
- env.Append(LINKFLAGS=" -O3")
-
-if sysname == "SunOS":
- env.Append(LINKFLAGS=" -L/opt/csw/lib -DSOLARIS ")
- env.Append(CFLAGS=" -I/opt/csw/include -DSOLARIS ")
- env.Append(CXXFLAGS=" -I/opt/csw/include -DSOLARIS ")
-
-
-env['build_appfw']=0
-env['build_tools']=0
-
-Export('env')
-SConscript("SConscript", variant_dir='build')
-