diff --git a/building/linux32ARMv6/pharo.cog.spur/build.assert/mvm b/building/linux32ARMv6/pharo.cog.spur/build.assert/mvm
deleted file mode 100755
index 3ce47fcf22..0000000000
--- a/building/linux32ARMv6/pharo.cog.spur/build.assert/mvm
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-# assert PharoVM with VM profiler and threaded heartbeat
-INSTALLDIR=assert/phcogspur32linuxhtRPi
-OPT="-g3 -O1 -DDEBUGVM=0 -DPharoVM"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure \
-		--without-npsqueak \
-		--without-vm-display-fbdev \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog \
-		--without-vm-display-fbdev \
-		--enable-fast-bitblt \
-	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
-	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0" \
-	LIBS=" -Wl,-rpath,'\$\$ORIGIN'"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux32ARMv6/pharo.cog.spur/build.debug/mvm b/building/linux32ARMv6/pharo.cog.spur/build.debug/mvm
deleted file mode 100755
index 907c9383e2..0000000000
--- a/building/linux32ARMv6/pharo.cog.spur/build.debug/mvm
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-# debug PharoVM with VM profiler and threaded heartbeat
-INSTALLDIR=debug/phcogspur32linuxhtRPi
-OPT="-g3 -O0 -DDEBUGVM=1 -DPharoVM"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure \
-		--without-npsqueak \
-		--without-vm-display-fbdev \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog \
-		--without-vm-display-fbdev \
-		--enable-fast-bitblt \
-	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
-	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0" \
-	LIBS=" -Wl,-rpath,'\$\$ORIGIN'"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux32ARMv6/pharo.cog.spur/build/mvm b/building/linux32ARMv6/pharo.cog.spur/build/mvm
deleted file mode 100755
index da1c4d0ef5..0000000000
--- a/building/linux32ARMv6/pharo.cog.spur/build/mvm
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-set -e
-# PharoVM with VM profiler and threaded heartbeat
-INSTALLDIR=phcogspur32linuxhtRPi
-# disable build of all dependencies by default because travis build takes too much time then fails.
-# in case we build "non-dependency" version, we need to remove plugins with dependencies (SDL2 in particular)
-if [ "$1" = "all" ]; then
-THIRDPARTYLIBS="libsdl2 libssh2 libgit2"
-EXTERNALPLUGINS="plugins.ext.all"
-shift 
-else
-THIRDPARTYLIBS=
-EXTERNALPLUGINS="plugins.ext"
-fi
-OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DPharoVM"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)	test -f Makefile && make reallyclean
-#	for lib in ${THIRDPARTYLIBS}; do
-#		../../third-party/mvm ${lib} clean
-#	done
-esac
-../../../../scripts/copylinuxpluginspecfiles
-
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib}
-done
-
-test -f config.h || ../../../../platforms/unix/config/configure \
-		--without-npsqueak \
-		--without-vm-display-fbdev \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog \
-		--without-vm-display-fbdev \
-		--enable-fast-bitblt \
-	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
-	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0" \
-	LIBS=" -Wl,-rpath,'\$\$ORIGIN'"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
-productDir=`(cd $productDir;pwd)`
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib} install $productDir
-done
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux32ARMv6/pharo.cog.spur/makeallclean b/building/linux32ARMv6/pharo.cog.spur/makeallclean
deleted file mode 100755
index a7cac6bd4e..0000000000
--- a/building/linux32ARMv6/pharo.cog.spur/makeallclean
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-trap 'exit 2' HUP INT PIPE TERM
-if [ "$1" = -fork ]; then
-	shift
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo y | ./mvm "$@") &
-	done
-	wait
-else
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo y | ./mvm "$@")
-	done
-fi
diff --git a/building/linux32ARMv6/pharo.cog.spur/makealldirty b/building/linux32ARMv6/pharo.cog.spur/makealldirty
deleted file mode 100755
index 11f39e8808..0000000000
--- a/building/linux32ARMv6/pharo.cog.spur/makealldirty
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-trap 'exit 2' HUP INT PIPE TERM
-if [ "$1" = -fork ]; then
-	shift
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo n | ./mvm "$@") &
-	done
-	wait
-else
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo n | ./mvm "$@")
-	done
-fi
diff --git a/building/linux32ARMv6/pharo.cog.spur/plugins.ext b/building/linux32ARMv6/pharo.cog.spur/plugins.ext
deleted file mode 100644
index 9cc64f5e84..0000000000
--- a/building/linux32ARMv6/pharo.cog.spur/plugins.ext
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.ext
-EXTERNAL_PLUGINS = \
-MIDIPlugin \
-B3DAcceleratorPlugin \
-FT2Plugin \
-JPEGReaderPlugin \
-JPEGReadWriter2Plugin \
-RePlugin \
-InternetConfigPlugin \
-SurfacePlugin \
-EventsHandlerPlugin \
-SqueakSSL \
-AioPlugin \
-FileAttributesPlugin \
-BochsIA32Plugin \
-BochsX64Plugin \
-GdbARMPlugin \
-GdbARMv8Plugin \
-VectorEnginePlugin \
-#SDL2DisplayPlugin
diff --git a/building/linux32ARMv6/pharo.cog.spur/plugins.ext.all b/building/linux32ARMv6/pharo.cog.spur/plugins.ext.all
deleted file mode 100644
index 3e86411da3..0000000000
--- a/building/linux32ARMv6/pharo.cog.spur/plugins.ext.all
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.ext
-EXTERNAL_PLUGINS = \
-B3DAcceleratorPlugin \
-FT2Plugin \
-JPEGReaderPlugin \
-JPEGReadWriter2Plugin \
-RePlugin \
-InternetConfigPlugin \
-SurfacePlugin \
-EventsHandlerPlugin \
-SDL2DisplayPlugin \
-
diff --git a/building/linux32ARMv6/pharo.cog.spur/plugins.int b/building/linux32ARMv6/pharo.cog.spur/plugins.int
deleted file mode 100644
index 9b1aefc744..0000000000
--- a/building/linux32ARMv6/pharo.cog.spur/plugins.int
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.int
-INTERNAL_PLUGINS = \
-ADPCMCodecPlugin \
-AsynchFilePlugin \
-B2DPlugin \
-BitBltPlugin \
-BMPReadWriterPlugin \
-CroquetPlugin \
-ZipPlugin \
-DropPlugin \
-DSAPrims \
-FFTPlugin \
-FileCopyPlugin \
-FilePlugin \
-Float64ArrayPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
-SqueakFFIPrims \
-IA32ABI \
-JoystickTabletPlugin \
-LargeIntegers \
-Matrix2x3Plugin \
-MiscPrimitivePlugin \
-Mpeg3Plugin \
-SecurityPlugin \
-SerialPlugin \
-SocketPlugin \
-SoundCodecPrims \
-SoundGenerationPlugin \
-SoundPlugin \
-StarSqueakPlugin \
-LocalePlugin \
-UnixOSProcessPlugin \
-VMProfileLinuxSupportPlugin \
-#Klatt \
-
diff --git a/building/linux32ARMv6/pharo.cog.spur/prepare-rpi.sh b/building/linux32ARMv6/pharo.cog.spur/prepare-rpi.sh
deleted file mode 100755
index 09680dde2d..0000000000
--- a/building/linux32ARMv6/pharo.cog.spur/prepare-rpi.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/bash
-
-set -e 
-
-MIRROR=http://archive.raspbian.org/raspbian
-VERSION=jessie
-# TOOLS_DIR=$PWD/tools
-ARMCHROOT=/srv/arm
-USER=esteban
-
-sudo apt-get install -yq --no-install-suggests --no-install-recommends --force-yes \
-     gcc-arm-linux-gnueabi \
-     gcc-arm-linux-gnueabihf \
-     qemu-system \
-     qemu-system-arm \
-     qemu-user \
-     qemu-user-static \
-     sbuild \
-     schroot \
-     scratchbox2 \
-     debootstrap \
-     zlib1g:i386 \
-     libstdc++6:i386 \
-     libffi-dev:i386 \
-     libffi6:i386 \
-     libssl1.0.0:i386 \
-     libbz2-1.0:i386 \
-     libc6-dev-i386 \
-     libc6:i386 \
-     libexpat1:i386 \
-     libtinfo5:i386 \
-     binfmt-support \
-     build-essential \
-     python-dev \
-     libffi-dev \
-     zlib1g-dev
-
-# add chroot
-sudo echo "
-[rpi]
-directory=$ARMCHROOT
-users=$USER
-root-users=$USER
-groups=$USER
-aliases=default
-type=directory
-" >>  /etc/schroot/schroot.conf
-
-# chroot
-if [ ! -e "$ARMCHROOT/etc/debian_chroot" ]; then
-	mkdir -p $ARMCHROOT
-	sudo qemu-debootstrap --no-check-gpg --include=fakeroot,build-essential --arch=armhf ${VERSION} ${ARMCHROOT} ${MIRROR}
-	sudo su -c "echo \"deb ${MIRROR} jessie main contrib rpi\" > ${ARMCHROOT}/etc/apt/sources.list"
-	schroot -c rpi -u root -- apt-get update
-	schroot -c rpi -u root -- apt-get --allow-unauthenticated install -y \
-		build-essential libcairo2-dev libpango1.0-dev libssl-dev uuid-dev uuid-runtime libasound2-dev \
-		debhelper devscripts libssl-dev libfreetype6-dev libx11-dev libxext-dev \
-		libx11-dev libsm-dev libice-dev libgl1-mesa-dev libgl1-mesa-glx git libtool automake autoconf
-    #needed for third-party libraries
-    schroot -c rpi -u root -- apt-get --allow-unauthenticated install -y cmake curl
-fi
-schroot -c rpi -- uname -m
-
-#sudo mount -o remount,size=100M /tmp || echo "No tmp size increase required"
-
diff --git a/building/linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm b/building/linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm
deleted file mode 100755
index 4431be7670..0000000000
--- a/building/linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-set -e
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-# assert Spur VM with VM profiler and itimer heartbeat
-INSTALLDIR=assert/nsnaccogspur32linux
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
-
-if [ $# -ge 1 ]; then
-	case "$1" in
-	-*)	;;
-	*)	INSTALLDIR="$1"; shift
-	esac
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			rm -f config.h; test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog.newspeak \
-		--without-vm-display-fbdev --without-npsqueak \
-	TARGET_ARCH="-m32" \
-	CFLAGS="$OPT -DEnforceAccessControl=0 -msse2 -DITIMER_HEARTBEAT=1"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR -source SqueakV41 "$@"
diff --git a/building/linux32x86/nsnac.cog.spur/build.assert/mvm b/building/linux32x86/nsnac.cog.spur/build.assert/mvm
deleted file mode 100755
index 9c457f8026..0000000000
--- a/building/linux32x86/nsnac.cog.spur/build.assert/mvm
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-set -e
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-# assert Spur VM with VM profiler and threaded heartbeat
-INSTALLDIR=assert/nsnaccogspur32linuxht
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
-
-if [ $# -ge 1 ]; then
-	case "$1" in
-	-*)	;;
-	*)	INSTALLDIR="$1"; shift
-	esac
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			rm -f config.h; test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog.newspeak \
-		--without-vm-display-fbdev --without-npsqueak \
-	TARGET_ARCH="-m32" \
-	CFLAGS="$OPT -DEnforceAccessControl=0 -msse2"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR -source SqueakV41 "$@"
diff --git a/building/linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm b/building/linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm
deleted file mode 100755
index 34ad395726..0000000000
--- a/building/linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-set -e
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-# debug Spur VM with VM profiler and itimer heartbeat
-INSTALLDIR=debug/nsnaccogspur32linux
-OPT="-g3 -O0 -DDEBUGVM=1"
-
-if [ $# -ge 1 ]; then
-	case "$1" in
-	-*)	;;
-	*)	INSTALLDIR="$1"; shift
-	esac
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			rm -f config.h; test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog.newspeak \
-		--without-vm-display-fbdev --without-npsqueak \
-	TARGET_ARCH="-m32" \
-	CFLAGS="$OPT -DEnforceAccessControl=0 -msse2 -DITIMER_HEARTBEAT=1"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR -source SqueakV41 "$@"
diff --git a/building/linux32x86/nsnac.cog.spur/build.debug/mvm b/building/linux32x86/nsnac.cog.spur/build.debug/mvm
deleted file mode 100755
index 924b4ec333..0000000000
--- a/building/linux32x86/nsnac.cog.spur/build.debug/mvm
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-set -e
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-# debug Spur VM with VM profiler and threaded heartbeat
-INSTALLDIR=debug/nsnaccogspur32linuxht
-OPT="-g3 -O0 -DDEBUGVM=1"
-
-if [ $# -ge 1 ]; then
-	case "$1" in
-	-*)	;;
-	*)	INSTALLDIR="$1"; shift
-	esac
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			rm -f config.h; test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog.newspeak \
-		--without-vm-display-fbdev --without-npsqueak \
-	TARGET_ARCH="-m32" \
-	CFLAGS="$OPT -DEnforceAccessControl=0 -msse2"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR -source SqueakV41 "$@"
diff --git a/building/linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm b/building/linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm
deleted file mode 100755
index 25c37829e8..0000000000
--- a/building/linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-set -e
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-# Spur VM with VM profiler and itimer heartbeat
-INSTALLDIR=nsnaccogspur32linux
-# Some gcc versions create a broken VM using -O2
-OPT="-g -O2 -DNDEBUG -DDEBUGVM=0"
-
-if [ $# -ge 1 ]; then
-	case "$1" in
-	-*)	;;
-	*)	INSTALLDIR="$1"; shift
-	esac
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			rm -f config.h; test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog.newspeak \
-		--without-vm-display-fbdev --without-npsqueak \
-	TARGET_ARCH="-m32" \
-	CFLAGS="$OPT -DEnforceAccessControl=0 -msse2 -DITIMER_HEARTBEAT=1"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR -source SqueakV41 "$@"
diff --git a/building/linux32x86/nsnac.cog.spur/build/mvm b/building/linux32x86/nsnac.cog.spur/build/mvm
deleted file mode 100755
index 9228e13105..0000000000
--- a/building/linux32x86/nsnac.cog.spur/build/mvm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-set -e
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-# VM with VM profiler and threaded heartbeat
-INSTALLDIR=nsnaccogspur32linuxht
-# Some gcc versions create a broken VM using -O2
-OPT="-g -O2 -DNDEBUG -DDEBUGVM=0"
-
-if [ $# -ge 1 ]; then
-	case "$1" in
-	-*)	;;
-	*)	INSTALLDIR="$1"; shift
-	esac
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			rm -f config.h; test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog.newspeak \
-		--without-vm-display-fbdev --without-npsqueak \
-	TARGET_ARCH="-m32" \
-	CFLAGS="$OPT -DEnforceAccessControl=0 -msse2"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR -source SqueakV41 "$@"
diff --git a/building/linux32x86/nsnac.cog.spur/makeallclean b/building/linux32x86/nsnac.cog.spur/makeallclean
deleted file mode 100755
index a7cac6bd4e..0000000000
--- a/building/linux32x86/nsnac.cog.spur/makeallclean
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-trap 'exit 2' HUP INT PIPE TERM
-if [ "$1" = -fork ]; then
-	shift
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo y | ./mvm "$@") &
-	done
-	wait
-else
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo y | ./mvm "$@")
-	done
-fi
diff --git a/building/linux32x86/nsnac.cog.spur/makealldirty b/building/linux32x86/nsnac.cog.spur/makealldirty
deleted file mode 100755
index 11f39e8808..0000000000
--- a/building/linux32x86/nsnac.cog.spur/makealldirty
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-trap 'exit 2' HUP INT PIPE TERM
-if [ "$1" = -fork ]; then
-	shift
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo n | ./mvm "$@") &
-	done
-	wait
-else
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo n | ./mvm "$@")
-	done
-fi
diff --git a/building/linux32x86/nsnac.cog.spur/plugins.ext b/building/linux32x86/nsnac.cog.spur/plugins.ext
deleted file mode 100644
index f97d8b6cdd..0000000000
--- a/building/linux32x86/nsnac.cog.spur/plugins.ext
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.ext
-EXTERNAL_PLUGINS = \
-SqueakSSL
diff --git a/building/linux32x86/nsnac.cog.spur/plugins.int b/building/linux32x86/nsnac.cog.spur/plugins.int
deleted file mode 100644
index cfd6f4c2c0..0000000000
--- a/building/linux32x86/nsnac.cog.spur/plugins.int
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int
-INTERNAL_PLUGINS = \
-AioPlugin \
-AsynchFilePlugin \
-BMPReadWriterPlugin \
-B2DPlugin \
-BitBltPlugin \
-DSAPrims \
-DropPlugin \
-FileCopyPlugin \
-FilePlugin \
-Float64ArrayPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
-HostWindowPlugin \
-ZipPlugin \
-JPEGReadWriter2Plugin \
-JPEGReaderPlugin \
-LargeIntegers \
-Matrix2x3Plugin \
-MiscPrimitivePlugin \
-IA32ABI \
-RePlugin \
-SecurityPlugin \
-SocketPlugin \
-SurfacePlugin \
-UUIDPlugin \
-UnixOSProcessPlugin \
-VMProfileLinuxSupportPlugin
diff --git a/building/linux32x86/pharo.cog.spur.minheadless/build.assert.itimerheartbeat/mvm b/building/linux32x86/pharo.cog.spur.minheadless/build.assert.itimerheartbeat/mvm
deleted file mode 100755
index 3927cfecb4..0000000000
--- a/building/linux32x86/pharo.cog.spur.minheadless/build.assert.itimerheartbeat/mvm
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash -e
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-# assert VM with VM profiler and itimer heartbeat
-INSTALLDIR=assert/phphcogspurlinux
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog \
-	CC="gcc -m32" \
-	CXX="g++ -m32" \
-	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1" \
-	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
-	LDFLAGS=-Wl,-z,now
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
diff --git a/building/linux32x86/pharo.cog.spur.minheadless/build.assert/mvm b/building/linux32x86/pharo.cog.spur.minheadless/build.assert/mvm
deleted file mode 100755
index 60cd90983c..0000000000
--- a/building/linux32x86/pharo.cog.spur.minheadless/build.assert/mvm
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash -e
-# PharoVM with VM profiler and threaded heartbeat
-THIRDPARTYLIBS="libsdl2 openssl libssh2 libgit2"
-
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-# Spur VM with VM profiler and threaded heartbeat
-INSTALLDIR=assert/phcogspurlinuxht
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)		
-	test -f Makefile && make clean
-#	for lib in ${THIRDPARTYLIBS}; do
-#		../../third-party/mvm ${lib} clean
-#	done
-esac
-
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib}
-done
-
-LDFLAGS="-L../../../../.thirdparty-cache/linux/i386/lib" \
-CFLAGS="-I../../../../.thirdparty-cache/linux/i386/include -I../../../.thirdparty-cache/linux/i386/include/SDL2" \
-	cmake \
-		-DCMAKE_BUILD_TYPE=Assert \
-		-DBUILD_I386_VERSION=ON \
-		-DSDL2_INCLUDE_DIR=../../../../.thirdparty-cache/linux/i386/include/SDL2 \
-		-DSDL2_LIBRARY_PATH=../../../../.thirdparty-cache/linux/i386/lib \
-		../../.. 
-make
-
-productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
-productDir=`(cd $productDir;pwd)`
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib} install $productDir
-done
-cp dist/* $productDir
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux32x86/pharo.cog.spur.minheadless/build.debug.itimerheartbeat/mvm b/building/linux32x86/pharo.cog.spur.minheadless/build.debug.itimerheartbeat/mvm
deleted file mode 100755
index 7a6f6d0a1e..0000000000
--- a/building/linux32x86/pharo.cog.spur.minheadless/build.debug.itimerheartbeat/mvm
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash -e
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-# debug Spur VM with VM profiler and itimer heartbeat
-INSTALLDIR=debug/phphcogspurlinux
-OPT="-g3 -O0 -DDEBUGVM=1"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog \
-	CC="gcc -m32" \
-	CXX="g++ -m32" \
-	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1" \
-	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
-	LDFLAGS=-Wl,-z,now
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
diff --git a/building/linux32x86/pharo.cog.spur.minheadless/build.itimerheartbeat/mvm b/building/linux32x86/pharo.cog.spur.minheadless/build.itimerheartbeat/mvm
deleted file mode 100755
index 49a66cb11a..0000000000
--- a/building/linux32x86/pharo.cog.spur.minheadless/build.itimerheartbeat/mvm
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash -e
-# PharoVM with VM profiler and itimer heartbeat
-
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-
-THIRDPARTYLIBS="libsdl2 openssl libssh2 libgit2"
-INSTALLDIR=phcogspurlinux
-
-# Some gcc versions create a broken VM using -O2
-OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DPharoVM -DIMMUTABILITY=1"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)	test -f Makefile && make reallyclean
-#	for lib in ${THIRDPARTYLIBS}; do
-#		../../third-party/mvm ${lib} clean
-#	done
-esac
-../../../../scripts/copylinuxpluginspecfiles
-
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib}
-done
-
-test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog \
-	CC="gcc -m32" \
-	CXX="g++ -m32" \
-	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1" \
-	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
-	LDFLAGS=-Wl,-z,now
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
-productDir=`(cd $productDir;pwd)`
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib} install $productDir
-done
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux32x86/pharo.cog.spur.minheadless/build/mvm b/building/linux32x86/pharo.cog.spur.minheadless/build/mvm
deleted file mode 100755
index ed1487f45f..0000000000
--- a/building/linux32x86/pharo.cog.spur.minheadless/build/mvm
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash -e
-# PharoVM with VM profiler and threaded heartbeat
-THIRDPARTYLIBS="libsdl2 openssl libssh2 libgit2"
-
-case "`uname -m`" in # ensure we see x86 as machine type
-i*86) ;; # we're good
-*) if type i386 2>&1 >/dev/null; then
-	echo "Re-exec as x86"
-	exec i386 "$0" "$@"
-fi ;;
-esac
-# Spur VM with VM profiler and threaded heartbeat
-INSTALLDIR=ph32mincogspurlinuxht
-
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)		
-	test -f Makefile && make clean
-#	for lib in ${THIRDPARTYLIBS}; do
-#		../../third-party/mvm ${lib} clean
-#	done
-esac
-
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib}
-done
-
-LDFLAGS="-L../../../../.thirdparty-cache/linux/i386/lib" \
-CFLAGS="-I../../../../.thirdparty-cache/linux/i386/include -I../../../.thirdparty-cache/linux/i386/include/SDL2" \
-	cmake \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DBUILD_I386_VERSION=ON \
-		-DSDL2_INCLUDE_DIR=../../../../.thirdparty-cache/linux/i386/include/SDL2 \
-		-DSDL2_LIBRARY_PATH=../../../../.thirdparty-cache/linux/i386/lib \
-		../../.. 
-make
-
-productDir=../../../../products/$INSTALLDIR
-rm -rf "$productDir"
-mkdir "$productDir"
-productDir=`(cd "$productDir";pwd)`
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib} install $productDir
-done
-cp dist/* $productDir
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux32x86/pharo.cog.spur.minheadless/makeallclean b/building/linux32x86/pharo.cog.spur.minheadless/makeallclean
deleted file mode 100755
index a7cac6bd4e..0000000000
--- a/building/linux32x86/pharo.cog.spur.minheadless/makeallclean
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-trap 'exit 2' HUP INT PIPE TERM
-if [ "$1" = -fork ]; then
-	shift
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo y | ./mvm "$@") &
-	done
-	wait
-else
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo y | ./mvm "$@")
-	done
-fi
diff --git a/building/linux32x86/pharo.cog.spur.minheadless/makealldirty b/building/linux32x86/pharo.cog.spur.minheadless/makealldirty
deleted file mode 100755
index 11f39e8808..0000000000
--- a/building/linux32x86/pharo.cog.spur.minheadless/makealldirty
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-trap 'exit 2' HUP INT PIPE TERM
-if [ "$1" = -fork ]; then
-	shift
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo n | ./mvm "$@") &
-	done
-	wait
-else
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo n | ./mvm "$@")
-	done
-fi
diff --git a/building/linux64ARMv8/pharo.stack.spur/apt-get-libs.sh b/building/linux64ARMv8/pharo.stack.spur/apt-get-libs.sh
deleted file mode 100755
index 982ba1825a..0000000000
--- a/building/linux64ARMv8/pharo.stack.spur/apt-get-libs.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/bash
-
-set -e 
-
-#MIRROR=http://archive.raspbian.org/raspbian
-#VERSION=jessie
-# TOOLS_DIR=$PWD/tools
-#ARMCHROOT=/srv/arm
-#USER=esteban
-
-sudo apt-get install -yq --no-install-suggests --no-install-recommends --force-yes \
-     gcc-arm-linux-gnueabi \
-     gcc-arm-linux-gnueabihf \
-     qemu-system \
-     qemu-system-arm \
-     qemu-user \
-     qemu-user-static \
-     sbuild \
-     schroot \
-     debootstrap \
-     zlib1g \
-     libstdc++6 \
-     libffi-dev \
-     libffi6 \
-     libssl1.0.2 \
-     libbz2-1.0 \
-     libgit2-dev \
-     libssh2-1-dev \
-     libc6-dev \
-     libc6 \
-     libexpat1 \
-     libtinfo5 \
-     binfmt-support \
-     build-essential \
-     python-dev \
-     libffi-dev \
-     zlib1g-dev
-
-#     scratchbox2 \
diff --git a/building/linux64ARMv8/pharo.stack.spur/build.debug/mvm b/building/linux64ARMv8/pharo.stack.spur/build.debug/mvm
deleted file mode 100755
index fba586b047..0000000000
--- a/building/linux64ARMv8/pharo.stack.spur/build.debug/mvm
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-# debug PharoVM with VM profiler and threaded heartbeat
-INSTALLDIR=debug/phstkspur64ARMv8linuxht
-OPT="-g3 -O0 -DDEBUGVM=1 -DPharoVM"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure \
-	--without-npsqueak \
-	--without-vm-display-fbdev \
-	--with-vmversion=5.0 \
-	--with-src=src/spur64.stack --disable-cogit \
-	--without-vm-display-fbdev \
-	--enable-fast-bitblt \
- 	TARGET_ARCH="-march=armv8-a" \
-	CFLAGS="$OPT -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__ -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0" \
-	LIBS=" -Wl,-rpath,'\$\$ORIGIN'"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux64ARMv8/pharo.stack.spur/build/mvm b/building/linux64ARMv8/pharo.stack.spur/build/mvm
deleted file mode 100755
index 828c2a4d8f..0000000000
--- a/building/linux64ARMv8/pharo.stack.spur/build/mvm
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-set -e
-# PharoVM with VM profiler and threaded heartbeat
-INSTALLDIR=phstkspur64ARMv8linuxht
-# disable build of all dependencies by default because travis build takes too much time then fails.
-# in case we build "non-dependency" version, we need to remove plugins with dependencies (SDL2 in particular)
-if [ "$1" = "all" ]; then
-THIRDPARTYLIBS="libsdl2 libssh2 libgit2"
-EXTERNALPLUGINS="plugins.ext.all"
-shift 
-else
-THIRDPARTYLIBS=
-EXTERNALPLUGINS="plugins.ext"
-fi
-OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DPharoVM"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)	test -f Makefile && make reallyclean
-#	for lib in ${THIRDPARTYLIBS}; do
-#		../../third-party/mvm ${lib} clean
-#	done
-esac
-../../../../scripts/copylinuxpluginspecfiles
-
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib}
-done
-
-test -f config.h || ../../../../platforms/unix/config/configure \
-	--with-vmversion=5.0 \
-	--without-vm-display-fbdev \
-	--without-npsqueak \
-	--with-src=src/spur64.stack --disable-cogit \
-	--enable-fast-bitblt \
-	TARGET_ARCH="-march=armv8-a" \
-	CFLAGS="$OPT -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__ -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0" \
-	LIBS=" -Wl,-rpath,'\$\$ORIGIN'"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
-productDir=`(cd $productDir;pwd)`
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib} install $productDir
-done
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux64ARMv8/pharo.stack.spur/plugins.ext b/building/linux64ARMv8/pharo.stack.spur/plugins.ext
deleted file mode 100644
index eb8af47d82..0000000000
--- a/building/linux64ARMv8/pharo.stack.spur/plugins.ext
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.ext
-EXTERNAL_PLUGINS = \
-MIDIPlugin \
-B3DAcceleratorPlugin \
-FT2Plugin \
-JPEGReaderPlugin \
-JPEGReadWriter2Plugin \
-RePlugin \
-InternetConfigPlugin \
-SurfacePlugin \
-EventsHandlerPlugin \
-SqueakSSL \
-AioPlugin \
-FileAttributesPlugin \
-BochsIA32Plugin \
-BochsX64Plugin \
-VectorEnginePlugin \
-#GdbARMPlugin \
-#SDL2DisplayPlugin \
diff --git a/building/linux64ARMv8/pharo.stack.spur/plugins.ext.all b/building/linux64ARMv8/pharo.stack.spur/plugins.ext.all
deleted file mode 100644
index 3e86411da3..0000000000
--- a/building/linux64ARMv8/pharo.stack.spur/plugins.ext.all
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.ext
-EXTERNAL_PLUGINS = \
-B3DAcceleratorPlugin \
-FT2Plugin \
-JPEGReaderPlugin \
-JPEGReadWriter2Plugin \
-RePlugin \
-InternetConfigPlugin \
-SurfacePlugin \
-EventsHandlerPlugin \
-SDL2DisplayPlugin \
-
diff --git a/building/linux64ARMv8/pharo.stack.spur/plugins.int b/building/linux64ARMv8/pharo.stack.spur/plugins.int
deleted file mode 100644
index 9b1aefc744..0000000000
--- a/building/linux64ARMv8/pharo.stack.spur/plugins.int
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.int
-INTERNAL_PLUGINS = \
-ADPCMCodecPlugin \
-AsynchFilePlugin \
-B2DPlugin \
-BitBltPlugin \
-BMPReadWriterPlugin \
-CroquetPlugin \
-ZipPlugin \
-DropPlugin \
-DSAPrims \
-FFTPlugin \
-FileCopyPlugin \
-FilePlugin \
-Float64ArrayPlugin \
-FloatArrayPlugin \
-FloatMathPlugin \
-SqueakFFIPrims \
-IA32ABI \
-JoystickTabletPlugin \
-LargeIntegers \
-Matrix2x3Plugin \
-MiscPrimitivePlugin \
-Mpeg3Plugin \
-SecurityPlugin \
-SerialPlugin \
-SocketPlugin \
-SoundCodecPrims \
-SoundGenerationPlugin \
-SoundPlugin \
-StarSqueakPlugin \
-LocalePlugin \
-UnixOSProcessPlugin \
-VMProfileLinuxSupportPlugin \
-#Klatt \
-
diff --git a/building/linux64x64/pharo.cog.spur.minheadless/build.assert.itimerheartbeat/mvm b/building/linux64x64/pharo.cog.spur.minheadless/build.assert.itimerheartbeat/mvm
deleted file mode 100755
index 32501f0835..0000000000
--- a/building/linux64x64/pharo.cog.spur.minheadless/build.assert.itimerheartbeat/mvm
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash -e
-case "`uname -m`" in # ensure we see x86_64 as machine type
-x86_64) ;; # we're good
-*) if type x86_64 2>&1 >/dev/null; then
-	echo "Re-exec as x86"_64
-	exec x86_64 "$0" "$@"
-fi ;;
-esac
-# assert VM with VM profiler and itimer heartbeat
-INSTALLDIR=assert/phphcogspur64linux
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog \
-	CC="clang" \
-	CXX="clang++" \
-	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1" \
-	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
-	LDFLAGS=-Wl,-z,now
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
diff --git a/building/linux64x64/pharo.cog.spur.minheadless/build.assert/mvm b/building/linux64x64/pharo.cog.spur.minheadless/build.assert/mvm
deleted file mode 100755
index d2840c9918..0000000000
--- a/building/linux64x64/pharo.cog.spur.minheadless/build.assert/mvm
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash -e
-# PharoVM with VM profiler and threaded heartbeat
-THIRDPARTYLIBS="libsdl2 openssl libssh2 libgit2"
-INSTALLDIR=assert/phcogspur64linuxht
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)		
-	test -f Makefile && make clean
-#	for lib in ${THIRDPARTYLIBS}; do
-#		../../third-party/mvm ${lib} clean
-#	done
-esac
-
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib}
-done
-
-LDFLAGS="-L../../../../.thirdparty-cache/linux/x86_64/lib" \
-CC=clang \
-CFLAGS="-I../../../../.thirdparty-cache/linux/x86_64/include -I../../../.thirdparty-cache/linux/x86_64/include/SDL2" \
-	cmake \
-		-DCMAKE_BUILD_TYPE=Assert \
-		-DBUILD_I386_VERSION=OFF \
-		-DSDL2_INCLUDE_DIR=../../../../.thirdparty-cache/linux/x86_64/include/SDL2 \
-		-DSDL2_LIBRARY_PATH=../../../../.thirdparty-cache/linux/x86_64/lib \
-		../../.. 
-make
-
-productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
-productDir=`(cd $productDir;pwd)`
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib} install $productDir
-done
-cp dist/* $productDir
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux64x64/pharo.cog.spur.minheadless/build.debug.itimerheartbeat/mvm b/building/linux64x64/pharo.cog.spur.minheadless/build.debug.itimerheartbeat/mvm
deleted file mode 100755
index 59516f5ead..0000000000
--- a/building/linux64x64/pharo.cog.spur.minheadless/build.debug.itimerheartbeat/mvm
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash -e
-case "`uname -m`" in # ensure we see x86_64 as machine type
-x86_64) ;; # we're good
-*) if type x86_64 2>&1 >/dev/null; then
-	echo "Re-exec as x86"_64
-	exec x86_64 "$0" "$@"
-fi ;;
-esac
-# debug Spur VM with VM profiler and itimer heartbeat
-INSTALLDIR=debug/phphcogspur64linux
-OPT="-g3 -O0 -DDEBUGVM=1"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			test -f Makefile && make reallyclean
-esac
-../../../../scripts/copylinuxpluginspecfiles
-test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog \
-	CC="clang" \
-	CXX="clang++" \
-	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1" \
-	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
-	LDFLAGS=-Wl,-z,now
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
diff --git a/building/linux64x64/pharo.cog.spur.minheadless/build.debug/mvm b/building/linux64x64/pharo.cog.spur.minheadless/build.debug/mvm
deleted file mode 100755
index e14ead15bf..0000000000
--- a/building/linux64x64/pharo.cog.spur.minheadless/build.debug/mvm
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash -e
-# PharoVM with VM profiler and threaded heartbeat
-THIRDPARTYLIBS="libsdl2 openssl libssh2 libgit2"
-INSTALLDIR=debug/phcogspur64linuxht
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)		
-	test -f Makefile && make clean
-#	for lib in ${THIRDPARTYLIBS}; do
-#		../../third-party/mvm ${lib} clean
-#	done
-esac
-
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib}
-done
-
-LDFLAGS="-L../../../../.thirdparty-cache/linux/x86_64/lib" \
-CC=clang \
-CFLAGS="-I../../../../.thirdparty-cache/linux/x86_64/include -I../../../.thirdparty-cache/linux/x86_64/include/SDL2" \
-	cmake \
-		-DCMAKE_BUILD_TYPE=Debug \
-		-DBUILD_I386_VERSION=OFF \
-		-DSDL2_INCLUDE_DIR=../../../../.thirdparty-cache/linux/x86_64/include/SDL2 \
-		-DSDL2_LIBRARY_PATH=../../../../.thirdparty-cache/linux/x86_64/lib \
-		../../.. 
-make
-
-productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
-productDir=`(cd $productDir;pwd)`
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib} install $productDir
-done
-cp dist/* $productDir
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux64x64/pharo.cog.spur.minheadless/build.itimerheartbeat/mvm b/building/linux64x64/pharo.cog.spur.minheadless/build.itimerheartbeat/mvm
deleted file mode 100755
index b0f2cad5a2..0000000000
--- a/building/linux64x64/pharo.cog.spur.minheadless/build.itimerheartbeat/mvm
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash -e
-# PharoVM with VM profiler and itimer heartbeat
-
-case "`uname -m`" in # ensure we see x86_64 as machine type
-x86_64) ;; # we're good
-*) if type x86_64 2>&1 >/dev/null; then
-	echo "Re-exec as x86"_64
-	exec x86_64 "$0" "$@"
-fi ;;
-esac
-
-THIRDPARTYLIBS="libsdl2 openssl libssh2 libgit2"
-INSTALLDIR=phcogspur64linux
-
-# Some gcc versions create a broken VM using -O2
-OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DPharoVM -DIMMUTABILITY=1"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)	test -f Makefile && make reallyclean
-#	for lib in ${THIRDPARTYLIBS}; do
-#		../../third-party/mvm ${lib} clean
-#	done
-esac
-../../../../scripts/copylinuxpluginspecfiles
-
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib}
-done
-
-test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 \
-		--with-src=src/spur32.cog \
-	CC="clang" \
-	CXX="clang++" \
-	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1" \
-	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
-	LDFLAGS=-Wl,-z,now
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
-make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
-productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
-productDir=`(cd $productDir;pwd)`
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib} install $productDir
-done
-../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
diff --git a/building/linux64x64/pharo.cog.spur.minheadless/build/mvm b/building/linux64x64/pharo.cog.spur.minheadless/build/mvm
deleted file mode 100755
index 05547303a3..0000000000
--- a/building/linux64x64/pharo.cog.spur.minheadless/build/mvm
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash -e
-# PharoVM with VM profiler and threaded heartbeat
-THIRDPARTYLIBS="libsdl2 openssl libssh2 libgit2"
-INSTALLDIR=ph64mincogspur64linuxht
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)		
-	test -f Makefile && make clean
-#	for lib in ${THIRDPARTYLIBS}; do
-#		../../third-party/mvm ${lib} clean
-#	done
-esac
-
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib}
-done
-
-LDFLAGS="-L../../../../.thirdparty-cache/linux/x86_64/lib" \
-CC=clang \
-CFLAGS="-I../../../../.thirdparty-cache/linux/x86_64/include -I../../../.thirdparty-cache/linux/x86_64/include/SDL2" \
-	cmake \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DBUILD_I386_VERSION=OFF \
-		-DSDL2_INCLUDE_DIR=../../../../.thirdparty-cache/linux/x86_64/include/SDL2 \
-		-DSDL2_LIBRARY_PATH=../../../../.thirdparty-cache/linux/x86_64/lib \
-		../../.. 
-make
-
-productDir=../../../../products/$INSTALLDIR
-rm -rf "$productDir"
-mkdir "$productDir"
-productDir=`(cd "$productDir";pwd)`
-for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib} install $productDir
-done
-cp dist/* "$productDir"
-../../editpharoinstall.sh "$productDir" "$@"
diff --git a/building/linux64x64/pharo.cog.spur.minheadless/makeallclean b/building/linux64x64/pharo.cog.spur.minheadless/makeallclean
deleted file mode 100755
index a7cac6bd4e..0000000000
--- a/building/linux64x64/pharo.cog.spur.minheadless/makeallclean
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-trap 'exit 2' HUP INT PIPE TERM
-if [ "$1" = -fork ]; then
-	shift
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo y | ./mvm "$@") &
-	done
-	wait
-else
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo y | ./mvm "$@")
-	done
-fi
diff --git a/building/linux64x64/pharo.cog.spur.minheadless/makealldirty b/building/linux64x64/pharo.cog.spur.minheadless/makealldirty
deleted file mode 100755
index 11f39e8808..0000000000
--- a/building/linux64x64/pharo.cog.spur.minheadless/makealldirty
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-trap 'exit 2' HUP INT PIPE TERM
-if [ "$1" = -fork ]; then
-	shift
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo n | ./mvm "$@") &
-	done
-	wait
-else
-	for d in `dirname $0`/build*; do
-		(cd ./$d
-		 echo n | ./mvm "$@")
-	done
-fi
diff --git a/building/macos32x86/common.minheadless/Makefile.app b/building/macos32x86/common.minheadless/Makefile.app
deleted file mode 100644
index 94116d1072..0000000000
--- a/building/macos32x86/common.minheadless/Makefile.app
+++ /dev/null
@@ -1,190 +0,0 @@
-#############################################################################
-# Generic Makefile for VM app bundle
-# Do make getversion to get make -n to work
-#
-# This is designed to be invoked by Makefile in a specific build directory via
-# include ../common.minheadless/Makefile.app
-#
-# Parameters:
-# VMSRCDIR defines the location of the VM source to build.  Required.
-#
-# COGDEFS supply any command-line defines to use, and may be null.
-#
-# The name of the VM to build.  Optional.  Defaults to Squeak
-#
-# SOURCEFILE the Smalltalk source file to link into this directory. Optional.
-#
-# APPSOURCE the Smalltalk source file to link into the app Resource. Optional.
-#
-# PLUGINSRCDIR defines the location of the plugin source, the subsets of which
-# selected by plugins.int and plugins.ext will be built. Optional. Defaults to
-# ../../src
-# 
-# CONFIGURATION defines what version of the VM to build, product, assert or
-# debug. Optional. Defaults to product. The default is overridden in mvm script
-
-ifeq ($(APPNAME),)
-APPNAME:=Cocoa
-endif
-ifeq ($(APPNAMEDEF),)
-APPNAMEDEF:=$(APPNAME)Fast
-endif
-ifeq ($(APPIDENTIFIER),)
-APPIDENTIFIER:=org.opensmalltalk.$(APPNAME)
-endif
-ifeq ($(USEPLUGINASDYLIB),)
-USEPLUGINASDYLIB:=FALSE
-endif
-
-ifeq ($(CONFIGURATION),debug)
-	APP:=$(APPNAME)Debug.app
-	VM_IDENTIFIER:=$(APPIDENTIFIER)Debug
-else ifeq ($(CONFIGURATION),assert)
-	APP:=$(APPNAME)Assert.app
-	VM_IDENTIFIER:=$(APPIDENTIFIER)Assert
-else # default CONFIGURATION=product => $(APPNAMEDEF).app
-	APP:=$(APPNAMEDEF).app
-	VM_IDENTIFIER:=$(APPIDENTIFIER)
-endif
-
-default:	$(APP)
-
-include ../common.minheadless/Makefile.vm
-include ../common.minheadless/Makefile.lib.extra
-include ../common.minheadless/Makefile.sources
-
-cleanall: cleanapp cleanastapp cleandbgapp cleanallvm
-
-cleanapp:
-	rm -rf $(APPNAMEDEF).app
-
-cleanastapp:
-	rm -rf $(APPNAME)Assert.app
-
-cleandbgapp:
-	rm -rf $(APPNAME)Debug.app
-
-VMEXE:=$(APP)/Contents/MacOS/$(VM)
-VMPLIST:=$(APP)/Contents/Info.plist
-
-ifeq ($(USEPLUGINASDYLIB),FALSE)
-VMBUNDLES:=$(addprefix $(APP)/Contents/Resources/, $(addsuffix .bundle, $(EXTERNAL_PLUGINS)))
-else ifeq ($(USEPLUGINASDYLIB),TRUE)
-VMPLUGINDYLIBS:=$(addprefix $(APP)/Contents/MacOS/Plugins/lib, $(addsuffix .dylib, $(EXTERNAL_PLUGINS)))
-else 
-$(error USEPLUGINASDYLIB has to be TRUE or FALSE)
-endif 
-
-ifneq ($(THIRDPARTYLIBS),) 
-THIRDPARTYPREREQS:=$(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(THIRDPARTYCACHEDIR)
-endif
-
-OSXICONS:=$(OSXDIR)/$(VM).icns $(wildcard $(OSXDIR)/$(SYSTEM)*.icns)
-VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS)))
-VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib
-VMLOCALIZATION:=$(APP)/Contents/Resources/English.lproj/Localizable.strings
-SOURCES:=
-ifneq ($(SOURCEFILE),)
-SOURCES:=./$(SOURCEFILE)
-endif
-ifneq ($(APPSOURCE),)
-SOURCES:=$(SOURCES) $(APP)/Contents/Resources/$(APPSOURCE)
-$(APP)/Contents/Resources/$(APPSOURCE): $(SOURCESDIR)/$(APPSOURCE)
-	test -f $@ || ln $(SOURCESDIR)/$(notdir $@) $@
-endif
-
-$(APP):	cleanbundles $(THIRDPARTYPREREQS) $(VMEXE) $(VMBUNDLES) $(VMPLUGINDYLIBS) \
-		$(VMPLIST) $(VMLOCALIZATION) $(VMMENUNIB) $(VMICONS) \
- 		$(SOURCES) $(THIRDPARTYLIBS) $(APPPOST) signapp touchapp
-
-# Bundles with missing prerequisites won't be built. But we need to force the
-# attempt to make them every time in case the prerequisites /have/ been built.
-# to do this we must both delete the bundles and touch any ignore files, upon
-# which the bundle build depends.
-cleanbundles:
-	-rm -rf $(APP)/Contents/Resources/*.bundle
-	-touch $(OBJDIR)/*.ignore
-
-$(VMEXE): $(OBJDIR)/$(VM)
-	@mkdir -p $(APP)/Contents/MacOS
-	cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS
-
-$(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle
-	@mkdir -p $(APP)/Contents/Resources
-	@if [ -f $(basename $<).ignore ]; then \
-		echo $(notdir $<) is being ignored; \
-		rm -rf $^; \
-	else \
-		echo cp -pR $< $(APP)/Contents/Resources; \
-		cp -pR $< $(APP)/Contents/Resources; \
-	fi
-	
-$(APP)/Contents/MacOS/Plugins/%.dylib: $(BLDDIR)/vm/%.dylib
-	@mkdir -p $(APP)/Contents/MacOS/Plugins
-	cp -p $< $(APP)/Contents/MacOS/Plugins
-	
-
-$(VMPLIST): $(OSXDIR)/$(SYSTEM)-Info.plist getversion
-	-mkdir -p $(APP)/Contents
-	cp -p $< $@
-	sed -i '' '\
-		s!$$(VERSION)!$(shell ./getversion VERSION_TAG)!g;\
-		s!$$(VERSION_NUMBER)!$(shell ./getversion VERSION_NUMBER)!g;\
-		s!$$(VERSION_TAG)!$(shell ./getversion VERSION_TAG)!g;\
-		s!$$(VIRTUAL_MACHINE_NICKNAME)!$(shell ./getversion VIRTUAL_MACHINE_NICKNAME)!g;\
-		s!$$(VM_NICKNAME)!$(shell ./getversion VM_NICKNAME)!g;\
-		s!$$(VM_MAJOR)!$(shell ./getversion VM_MAJOR)!g;\
-		s!$$(VM_MINOR)!$(shell ./getversion VM_MINOR)!g;\
-		s!$$(VM_IDENTIFIER)!$(VM_IDENTIFIER)!g;\
-	' $@
-
-$(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings
-	@mkdir -p $(dir $@)
-	cp -p $< $@
-
-$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
-	@mkdir -p $(dir $@)
-	$(XCUB)/ibtool --errors --warnings --notices --module $(VM) \
-	--minimum-deployment-target $(TARGET_VERSION_MIN) \
-	--auto-activate-custom-fonts --output-format human-readable-text \
-	--compile $(VMMENUNIB) \
-	$(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
-
-$(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns
-	@mkdir -p $(APP)/Contents/Resources
-	cp -p $< $(APP)/Contents/Resources
-
-# To sign the app, set SIGNING_IDENTITY in the environment, e.g.
-# export SIGNING_IDENTITY="Developer ID Application: Eliot Miranda"
-#
-ifeq ($(SIGNING_IDENTITY),)
-signapp:
-	echo "No signing identity found (SIGNING_IDENTITY unset). Not signing app."
-else
-signapp:
-	codesign -f --deep -s "$(SIGNING_IDENTITY)" $(APP)
-endif
-
-touchapp:
-	touch $(APP)
-
-# source installation
-%.sources: ../../../sources/%.sources
-	ln $< $@
-
-$(APP)/Contents/Resources/%.sources: ../../../sources/%.sources
-	ln $< $@
-
-print-app-settings:
-	@echo ---------------- Makefile.app settings ------------------
-	@echo APP=$(APP)
-	@echo VMEXE=$(VMEXE)
-	@echo VMBUNDLES=$(VMBUNDLES)
-	@echo VMPLUGINDYLIBS=$(VMPLUGINDYLIBS)
-	@echo VMPLIST=$(VMPLIST)
-	@echo VMICONS=$(VMICONS)
-	@echo SIGNING_IDENTITY=$(SIGNING_IDENTITY)
-	@echo SOURCEFILE=$(SOURCEFILE)
-	@echo APPSOURCE=$(APPSOURCE)
-	@echo SOURCES=$(SOURCES)
-	@echo -----------------------------------------------------
diff --git a/building/macos32x86/common.minheadless/Makefile.app.newspeak b/building/macos32x86/common.minheadless/Makefile.app.newspeak
deleted file mode 100644
index 55c7e34470..0000000000
--- a/building/macos32x86/common.minheadless/Makefile.app.newspeak
+++ /dev/null
@@ -1,29 +0,0 @@
-##############################################################################
-# Generic Makefile for Mac OS X Newspeak or Glue Cocoa VM
-#
-
-# The caller should set VMSRCDIR to point to the relevant VM source
-# e.g. VMSRCDIR:= ../../../src/spur32.cog.newspeak
-
-VM:=NewspeakVirtualMachine
-SYSTEM:=Newspeak
-APPSOURCE?=SqueakV50.sources
-SOURCEFILE?=SqueakV50.sources
-
-APPPOST:=renameExe renameIcon
-
-# Now include the Makefile proper, which is common to all Mac OS builds.
-#
-include ../common/Makefile.app
-
-# Rename NewspeakVirtualMachine to the problematic Newspeak Virtual Machine
-
-renameExe: $(APP)/Contents/MacOS/NewspeakVirtualMachine
-	mv $(APP)/Contents/MacOS/NewspeakVirtualMachine \
-		"$(APP)/Contents/MacOS/Newspeak Virtual Machine"
-
-# Likewise, rename NewspeakVirtualMachine.icns
-
-renameIcon: $(APP)/Contents/Resources/NewspeakVirtualMachine.icns
-	mv $(APP)/Contents/Resources/NewspeakVirtualMachine.icns \
-		"$(APP)/Contents/Resources/Newspeak Virtual Machine.icns"
diff --git a/building/macos32x86/common.minheadless/Makefile.app.squeak b/building/macos32x86/common.minheadless/Makefile.app.squeak
deleted file mode 100644
index 9fcc63b6b6..0000000000
--- a/building/macos32x86/common.minheadless/Makefile.app.squeak
+++ /dev/null
@@ -1,22 +0,0 @@
-##############################################################################
-# Generic Makefile for Mac OS X Squeak Cog Cocoa VM
-#
-
-# The caller should set VMSRCDIR to point to the relevant VM source
-# e.g. VMSRCDIR:= ../../../src/spur32.cog
-
-# Produce Squeak.app, SqueakAssert.app & SqueakDebug.app
-APPNAME:=Squeak
-APPNAMEDEF:=$(APPNAME)
-APPIDENTIFIER:=org.squeak.$(APPNAME)
-
-APPPOST:=overwriteSqueakIcon
-
-# Now include the Makefile proper, which is common to all Mac OS builds.
-#
-include ../common/Makefile.app
-
-# Replace the standard yellow VM icon with the green one used for Cog VMs
-
-overwriteSqueakIcon: $(APP)/Contents/Resources/Squeak.icns
-	cp -p $(OSXDIR)/GreenCogSqueak.icns $(APP)/Contents/Resources/Squeak.icns
diff --git a/building/macos32x86/common.minheadless/Makefile.clangversion b/building/macos32x86/common.minheadless/Makefile.clangversion
deleted file mode 100644
index 8daa30d3a3..0000000000
--- a/building/macos32x86/common.minheadless/Makefile.clangversion
+++ /dev/null
@@ -1,26 +0,0 @@
-#############################################################################
-# Determine clang version and set CLANG_7_3_OR_ABOVE & CLANG_7_2_OR_BELOW as so
-#
-
-XCODETOOLCHAINS := /Applications/Xcode.app/Contents/Developer/Toolchains
-XCODETOOLCHAIN := $(XCODETOOLCHAINS)/XcodeDefault.xctoolchain
-
-# /usr/bin/clang, a.k.a. $(XCODETOOLCHAIN)/usr/bin/clang
-CC := clang
-# convoluted, but clang -version writes to /dev/tty, /not/ stdout :-(
-CLVERSION:= $(shell ls $(XCODETOOLCHAIN)/usr/lib/clang)
-CLVERMAJ := $(shell echo $(CLVERSION) | cut -f1 -d.)
-CLVERMIN := $(shell echo $(CLVERSION) | cut -f2 -d.)
-
-# One glaring deficiency of GNU Make is the absence of arithmetic support
-ifneq ($(filter 0 1 2 3 4 5 6,$(CLVERMAJ)),)
-	 CLANG_7_2_OR_BELOW:=true
-else ifeq ($(CLVERMAJ), 7)
-	ifneq ($(filter 0 1 2,$(CLVERMIN)),)
-		 CLANG_7_2_OR_BELOW:=true
-	else
-		CLANG_7_3_OR_ABOVE:=true
-	endif
-else
-	CLANG_7_3_OR_ABOVE:=true
-endif
diff --git a/building/macos32x86/common.minheadless/Makefile.flags b/building/macos32x86/common.minheadless/Makefile.flags
deleted file mode 100644
index d07749861b..0000000000
--- a/building/macos32x86/common.minheadless/Makefile.flags
+++ /dev/null
@@ -1,56 +0,0 @@
-#############################################################################
-# Compilation flags & paths for Mac OS X
-#
-# These are derived from Xcode v 6.2 for Apple LLVM version 6.0 (clang-600.0.57)
-
-XCODE:=/Applications/Xcode.app/Contents/Developer
-XCUB:=$(XCODE)/usr/bin
-SDKsDIR:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs
-#Build the oldest SDK installed
-SDKs:=MacOSX10.9.sdk MacOSX10.10.sdk MacOSX10.11.sdk MacOSX10.12.sdk
-SDK:=$(firstword $(realpath $(addprefix $(SDKsDIR)/, $(SDKs))))
-TARGET_ARCH:=i386
-TARGET_VERSION_MIN:=10.7
-
-print-sdks:
-	@echo ---------------- Makefile.flags settings ------------------
-	@echo SDKs=$(realpath $(addprefix $(SDKsDIR)/, $(SDKs)))
-	@echo SDK=$(SDK)
-	@echo -----------------------------------------------------
-
-# N.B. ARC isn't supported by the os-x 32-bit legacy Objective-C runtime kernel.
-# ARC is supported only on 64-bits, and then only for the 10.7 SDK and later.
-include ../common.minheadless/Makefile.clangversion
-ifdef CLANG_7_3_OR_ABOVE
-	OBJC_CODE_MODEL := -fobjc-weak
-else
-	OBJC_CODE_MODEL := -fno-objc-arc
-endif
-CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \
-		-arch $(TARGET_ARCH) \
-		-mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \
-			-fvisibility=default -fwrapv \
-			-fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \
-			-fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \
-			$(OBJC_CODE_MODEL) \
-			$(XCFLAGS) \
-		-isysroot $(SDK)
-
-BFLAGS:=-arch $(TARGET_ARCH) -bundle -isysroot $(SDK) $(EXTRABFLAGS)
-DYFLAGS:=-arch $(TARGET_ARCH) -shared -isysroot $(SDK) $(EXTRADYFLAGS)
-
-WARNINGS:= -Wno-missing-field-initializers -Wno-missing-prototypes \
-	-Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function \
-	-Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value \
-	-Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow \
-	-Wno-four-char-constants -Wno-conversion -Wno-constant-conversion \
-	-Wno-int-conversion -Wno-bool-conversion -Wno-enum-conversion \
-	-Wno-sign-conversion -Wno-shorten-64-to-32 -Wpointer-sign -Wno-newline-eof \
-	-Wno-trigraphs -Wdeprecated-declarations
-
-FRAMEWORKS:=-fobjc-link-runtime \
-			-framework Foundation -framework OpenGL -framework Cocoa \
-			-framework AudioToolbox -framework CoreAudio -framework QuickTime \
-			-framework SystemConfiguration \
-			-framework ApplicationServices -framework Security \
-			-framework QuartzCore 
diff --git a/building/macos32x86/common.minheadless/Makefile.lib.extra b/building/macos32x86/common.minheadless/Makefile.lib.extra
deleted file mode 100644
index d7825059da..0000000000
--- a/building/macos32x86/common.minheadless/Makefile.lib.extra
+++ /dev/null
@@ -1,33 +0,0 @@
-# 
-# THIRDPARTYLIBS			The libraries to build (you define them in ./third-party/LIB/Makefile.lib)
-# THIRDPARTYDIR				Where to build libraries
-# THIRDPARTYOUTDIR 			Where to first install libraries (output place)
-# THIRDPARTYCACHEDIR 		Where to download thirdparty libraries
-# 
-# REQUIRES: 
-#   USEPLUGINASDYLIB 		Used to define where to place built libraries (default is FALSE (or absent)). 
-# 
-
-THIRDPARTYDIR?=$(BLDDIR)/third-party
-THIRDPARTYLIBDIR?=$(THIRDPARTYOUTDIR)/lib
-THIRDPARTYINCLUDEDIR?=$(THIRDPARTYOUTDIR)/include
-THIRDPARTYCACHEDIR?=../../../.thirdparty-cache
-THIRDPARTYOUTDIR?=$(abspath $(THIRDPARTYCACHEDIR)/macOS/i386)
-
-ifeq ($(USEPLUGINASDYLIB),TRUE)
-THIRDPARTYINSTALLDIR:=$(APP)/Contents/MacOS/Plugins
-else 
-THIRDPARTYINSTALLDIR:=$(APP)/Contents/Resources
-endif 
-
-$(THIRDPARTYDIR):
-	if [ ! -d $(THIRDPARTYDIR) ]; then mkdir -p $(THIRDPARTYDIR); fi
-	
-$(THIRDPARTYOUTDIR): $(THIRDPARTYDIR)
-	if [ ! -d $(THIRDPARTYOUTDIR) ]; then mkdir -p $(THIRDPARTYOUTDIR); fi
-	
-$(THIRDPARTYINSTALLDIR):
-	if [ ! -d $(THIRDPARTYINSTALLDIR) ]; then mkdir -p $(THIRDPARTYINSTALLDIR); fi
-		
-$(THIRDPARTYCACHEDIR):
-	if [ ! -d $(THIRDPARTYCACHEDIR) ]; then mkdir -p $(THIRDPARTYCACHEDIR); fi
\ No newline at end of file
diff --git a/building/macos32x86/common.minheadless/Makefile.plugin b/building/macos32x86/common.minheadless/Makefile.plugin
deleted file mode 100644
index 8638db27be..0000000000
--- a/building/macos32x86/common.minheadless/Makefile.plugin
+++ /dev/null
@@ -1,243 +0,0 @@
-#############################################################################
-# Generic Makefile for plugins on Cocoa Mac OS X
-# Do make getversion to get make -n to work
-#
-# The following variables can be overridden in the platform Makefile, e.g.
-# platforms/iOS/plugins/AioPlugin/Makefile.  Look at
-# platforms/iOS/plugins/*/Makefile for examples.
-#
-# CFLAGS     	 adds additional compilation flags to source file compilation
-# XCFLAGS    	 adds additional compilation flags after all other flags
-# EXCLUDESRC 	 defines patterns of source files to not compile, e.g. %/dump.c
-# EXTRALIBS  	 defines additional libraries to link into an external plugin bundle
-# INCDIRS    	 defines additonal directories in which to search for includes
-# LIBSRC     	 overrides the set of files to compile (if EXCLUDESRC inconvenient)
-# LINK_WITH_CPP  set to non-empty to link external plugin bundle with c++ runtime
-# SRCDIRS    	 supplies additional directories containing files to compile.
-# PREREQUISITES  supplies names of files that must exist to make lib or bundle
-# THIRDPARTYLIBS supplies names for third-party libraries that needs to be built
-
-$(info $$(LIBNAME): $(LIBNAME))
-
-# VM config flags.
-ifeq ($(CONFIGURATION),product)
-OFLAGS:= -g -Os
-AT_MOST_OPT_LEVEL_ONE:=-O1
-DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1
-BUILD:=build
-else ifeq ($(CONFIGURATION),assert)
-OFLAGS:= -g -O1 -fno-omit-frame-pointer
-AT_MOST_OPT_LEVEL_ONE:=-O1
-DEBUGVM=-DDEBUGVM=0
-BUILD:=buildast
-else
-OFLAGS:= -g -O0 -fno-omit-frame-pointer
-AT_MOST_OPT_LEVEL_ONE:=-O0
-DEBUGVM=-DDEBUGVM=1
-BUILD:=builddbg
-endif
-
-CFLAGS:= $(CFLAGS) $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS)
-
-# The following are the four key locations (set via invocation):
-# PLUGINSRCDIR: Where is the root of the src/plugins source tree?
-# VMSRCDIR: Where is the root of the src vm source tree?
-# PLATDIR: Where is the root of the platforms tree?
-
-#############################################################################
-# Standard directory locations:
-#   CROSSDIR: The location of the cross platform sources
-#   OSXPLGDIR: The location of the iOS sources
-#   MAKERDIR: The location of the VMMaker generated sources
-#   BUILDDIR: The location where the plugin is built
-#
-#PLUGINSRCDIR:=	../../../src/plugins
-
-ifeq ($(USEPLUGINASDYLIB),TRUE)
-# I do not like to use lib "as is" because that will strip all "lib" occurences, but I do not 
-# find any better solution :(
-LIBDIR:=$(subst lib,,$(LIBNAME))
-else
-LIBDIR:=$(LIBNAME)
-endif
-
-CROSSDIR:=	$(PLATDIR)/Cross/plugins/$(LIBDIR)
-OSXDIR:=	$(PLATDIR)/iOS/vm/OSX
-OSXPLGDIR:=	$(PLATDIR)/iOS/plugins/$(LIBDIR)
-UNIXDIR:=	$(PLATDIR)/unix/vm
-MAKERDIR:=	$(PLUGINSRCDIR)/$(LIBDIR)
-BUILDDIR:=	$(BUILD)/$(LIBDIR)
-
-# Support directory locations
-CROSSVMDIR:=$(PLATDIR)/Cross/vm
-OSXVMDIR:=$(PLATDIR)/iOS/vm/OSX
-MAKERVMDIR:=$(VMSRCDIR)
-
-# INCDIRS are where include files are searched for. A superset of SRCDIRS.
-INCDIRS:= $(MAKERVMDIR) $(CROSSVMDIR) $(MAKERDIR) $(OSXPLGDIR) $(OSXVMDIR) $(CROSSDIR) $(INCDIRS)
-INCLUDES:= $(addprefix -I,. $(INCDIRS))
-
-#############################################################################
-# If no source files were given, use standard set
-#
-
-SRCDIRS:=$(SRCDIRS) $(MAKERDIR) $(CROSSDIR) $(OSXPLGDIR) 
-LIBSRC?= $(foreach d,$(SRCDIRS),$(wildcard $(d)/*.c) $(wildcard $(d)/*.cpp) $(wildcard $(d)/*.m))
-ifneq ($(EXCLUDESRC),)
-LIBSRC:=$(filter-out $(EXCLUDESRC),$(LIBSRC))
-endif
-
-#############################################################################
-# bundle settings
-#
-# Note: By default DLLTOOL/DLLWRAP do the work for everything related to plugins
-# but if LINK_WITH_GCC we use gcc and if LINK_WITH_GPP we use g++.
-#
-DLLTOOL:=	dlltool
-DLLWRAP:=	dllwrap -mno-cygwin
-#OPTSTRIP:=	strip # for production
-OPTSTRIP:=	echo not doing strip
-
-#############################################################################
-# Plugin settings
-#
-OBJDIR:=    $(BUILD)/$(LIBNAME)
-VMDIR:=     $(BUILD)/vm
-PLUGINLIB:= $(VMDIR)/$(LIBNAME).lib
-PLUGINBUNDLE:= $(VMDIR)/$(LIBNAME).bundle
-PLUGINEXE:= $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME)
-
-PLUGINDYLIB:= $(VMDIR)/$(LIBNAME).dylib
-
-# https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Introduction/Introduction.html
-PLUGINPLIST:= $(PLUGINBUNDLE)/Contents/Info.plist
-PLUGINICONS:= $(PLUGINBUNDLE)/Contents/Resources/SqueakPlugin.icns
-LIBOBJ?=$(notdir $(LIBSRC))
-LIBOBJ:=$(patsubst %.c,%.o,$(patsubst %.m,%.o,$(patsubst %.cpp,%.o,$(LIBOBJ))))
-LIBOBJ:=$(addprefix $(OBJDIR)/,$(LIBOBJ))
-
-VPATH:= $(SRCDIRS)
-
-# If plugins change from internal to external they must be recompiled.
-$(BUILD)/$(LIBNAME)/$(LIBNAME).o: plugins.int plugins.ext
-
-#############################################################################
-# Rules for automated builds
-
-include ../common.minheadless/Makefile.rules
-
-all: $(PLUGINLIB) $(PLUGINBUNDLE) $(PLUGINDYLIB)
-
-print-settings:
-	@echo ---------------- Makefile.plugin settings ------------------
-	@echo PWD=$(shell pwd)
-	@echo MAKEFILE=$(MAKEFILE)
-	@echo VPATH=$(VPATH)
-	@echo INCLUDES=$(INCLUDES)
-	@echo CFLAGS=$(CFLAGS)
-	@echo PLUGINSRCDIR=$(PLUGINSRCDIR)
-	@echo VMSRCDIR=$(VMSRCDIR)
-	@echo CROSSDIR=$(CROSSDIR)
-	@echo OSXPLGDIR=$(OSXPLGDIR)
-	@echo OSXDIR=$(OSXDIR)
-	@echo MAKERDIR=$(MAKERDIR)
-	@echo CROSSSRC=$(CROSSSRC)
-	@echo OSXSRC=$(OSXSRC)
-	@echo MAKERSRC=$(MAKERSRC)
-	@echo SRCDIRS=$(SRCDIRS)
-	@echo INCDIRS=$(INCDIRS)
-	@echo LIBSRC=$(LIBSRC)
-	@echo LIBOBJ=$(LIBOBJ)
-	@echo BUILD=$(BUILD)
-	@echo OBJDIR=$(OBJDIR)
-	@echo VMDIR=$(VMDIR)
-	@echo PLUGINLIB=$(PLUGINLIB)
-	@echo PLUGINEXE=$(PLUGINEXE)
-	@echo PLUGINBUNDLE=$(PLUGINBUNDLE)
-	@echo deps=$(patsubst %,deps/%.d,$(notdir $(basename $(LIBSRC))))
-	@echo -----------------------------------------------------
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-$(VMDIR):
-	mkdir -p $(VMDIR)
-
-# If any prerequisites are declared all must exist to continue
-ifeq ($(realpath $(PREREQUISITES)),$(abspath $(PREREQUISITES)))
-
-$(PLUGINLIB): $(PLUGINREQS) $(VMDIR) $(OBJDIR) $(LIBOBJ)
-	-rm $(PLUGINLIB)
-	ar -rc $(PLUGINLIB) $(LIBOBJ)
-
-# Either link with normal compiler/linker or with cpp compiler/linker.  If
-# LINK_WITH_CPP is set, use e.g. clang++
-$(PLUGINBUNDLE): $(PLUGINREQS) $(PLUGINEXE) $(PLUGINICONS) $(PLUGINPLIST)
-
-$(PLUGINEXE): $(PLUGINREQS) $(VMDIR) $(OBJDIR) $(LIBOBJ)
-	mkdir -p $(PLUGINBUNDLE)/Contents/MacOS
-ifneq ($(LINK_WITH_CPP),)
-	$(LDCXX) \
-	$(BFLAGS) \
-	-Wl,-bundle_loader,$(VMDIR)/$(VM) \
-	$(LIBOBJ) $(EXTRALIBS) \
-	-o $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME)
-else
-	$(LD) \
-	$(BFLAGS) \
-	-Wl,-bundle_loader,$(VMDIR)/$(VM) \
-	$(LIBOBJ) $(EXTRALIBS) \
-	-o $(PLUGINBUNDLE)/Contents/MacOS/$(LIBNAME)
-endif
-
-$(PLUGINICONS): $(OSXDIR)/SqueakPlugin.icns
-	mkdir -p $(PLUGINBUNDLE)/Contents/Resources
-	cp -p $< $@
-
-$(PLUGINPLIST): $(PLATDIR)/iOS/plugins/Info.plist getversion
-	-mkdir -p $(PLUGINBUNDLE)/Contents
-	cp -p $< $@
-	sed -i '' '\
-		s!$$(VERSION)!$(shell ./getversion VERSION_TAG)!g;\
-		s!$$(LIBNAME)!$(LIBNAME)!g;\
-	' $@
-
-$(PLUGINDYLIB): $(PLUGINREQS) $(VMDIR) $(OBJDIR) $(LIBOBJ)
-ifneq ($(LINK_WITH_CPP),)
-	$(LDCXX) \
-	$(DYFLAGS) \
-	-install_name @executable_path/Plugins/$(LIBNAME).dylib \
-	$(LIBOBJ) $(EXTRALIBS) \
-	-o $(VMDIR)/$(LIBNAME).dylib
-else
-	$(LD) \
-	$(DYFLAGS) \
-	-install_name @executable_path/Plugins/$(LIBNAME).dylib \
-	$(LIBOBJ) $(EXTRALIBS) \
-	-o $(VMDIR)/$(LIBNAME).dylib
-endif
-
-getversion:
-	make -f ../common.minheadless/Makefile.vm getversion
-
-else # ifeq ($(realpath $(PREREQUISITES)),$(PREREQUISITES))
-# If any prerequisites are missing simply create a .ignore file
-
-#$(info $$(PREREQUISITES): $(abspath $(PREREQUISITES)))
-#$(info $$(realpath $$(PREREQUISITES)): $(realpath $(PREREQUISITES)))
-
-$(PLUGINLIB): FORCE
-	$(warning $(PLUGINLIB) has missing prerequisites. Not building.)
-	echo >$(basename $(PLUGINLIB)).ignore
-
-$(PLUGINBUNDLE):	FORCE
-	$(warning $(PLUGINBUNDLE) has missing prerequisites. Not building.)
-	echo >$(basename $(PLUGINBUNDLE)).ignore
-
-$(PLUGINDYLIB):	FORCE
-	$(warning $(PLUGINDYLIB) has missing prerequisites. Not building.)
-	echo >$(basename $(PLUGINDYLIB)).ignore
-
-FORCE:
-
-endif
diff --git a/building/macos32x86/common.minheadless/Makefile.rules b/building/macos32x86/common.minheadless/Makefile.rules
deleted file mode 100644
index e9a4fce9da..0000000000
--- a/building/macos32x86/common.minheadless/Makefile.rules
+++ /dev/null
@@ -1,34 +0,0 @@
-#############################################################################
-# Compilation rules for Mac OS X
-#
-# See http://make.mad-scientist.net/papers/advanced-auto-dependency-generation
-# for an explanation of the dependency management scheme.
-
-# /usr/bin/clang, a.k.a. /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-CC := clang
-LD := clang
-LDCXX := clang++ # For linking c++ bundles
-
-include ../common.minheadless/Makefile.flags
-
-DEPFLAGS = -MT $@ -MMD -MP -MF deps/$(*F).Td
-ALLFLAGS = $(DEPFLAGS) $(WARNINGS) $(CFLAGS)
-POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' | sed 's/^build[^/]*/$$(BUILD)/' > deps/$(*F).d; rm deps/$(*F).Td; touch -r $< deps/$(*F).d
-
-$(OBJDIR)/%.o: %.c deps/%.d $(MAKEFILE)
-	$(CC) -x c $(ALLFLAGS) $(INCLUDES) -c $< -o $@
-	$(POSTCOMPILE)
-
-$(OBJDIR)/%.o: %.m deps/%.d $(MAKEFILE)
-	$(CC) -x objective-c $(ALLFLAGS) $(INCLUDES) -c $< -o $@
-	$(POSTCOMPILE)
-
-$(OBJDIR)/%.o: %.cpp deps/%.d $(MAKEFILE)
-	$(CC) -x c++ $(ALLFLAGS) $(INCLUDES) -c $< -o $@
-	$(POSTCOMPILE)
-
-deps/%.d: ;
-
-.PRECIOUS: deps/%.d
-
--include $(patsubst %,deps/%.d,$(notdir $(basename $(VMSRC) $(LIBSRC))))
diff --git a/building/macos32x86/common.minheadless/Makefile.sources b/building/macos32x86/common.minheadless/Makefile.sources
deleted file mode 100644
index ad01b2f6cb..0000000000
--- a/building/macos32x86/common.minheadless/Makefile.sources
+++ /dev/null
@@ -1,24 +0,0 @@
-#############################################################################
-# Generic Makefile for downloading sources
-
-SOURCESDIR:=../../../sources
-
-$(SOURCESDIR):
-	mkdir -p $(SOURCESDIR)
-
-%.sources: $(SOURCESDIR) $(SOURCESDIR)/%.sources
-	test -f $@ || ln $(SOURCESDIR)/$(notdir $@) $@
-
-$(SOURCESDIR)/PharoV50.sources: 
-	curl http://files.pharo.org/get-files/50/sources.zip -o $@.zip
-	(cd $(SOURCESDIR); unzip $(@F).zip)
-	chmod 444 $@
-	-rm $@.zip
-
-$(SOURCESDIR)/SqueakV50.sources \
-$(SOURCESDIR)/SqueakV46.sources \
-$(SOURCESDIR)/SqueakV41.sources: 
-	curl http://ftp.squeak.org/sources_files/$(@F).gz -o $@.gz
-	(cd $(SOURCESDIR); gunzip $(@F).gz)
-	chmod 444 $@
-	-rm $@.zip
diff --git a/building/macos32x86/common.minheadless/Makefile.vm b/building/macos32x86/common.minheadless/Makefile.vm
deleted file mode 100644
index f9666b8227..0000000000
--- a/building/macos32x86/common.minheadless/Makefile.vm
+++ /dev/null
@@ -1,299 +0,0 @@
-#############################################################################
-# Generic Makefile for Mac OS VM 
-# Do make getversion to get makwe -n to work
-#
-# This is designed to be invoked by Makefile in a specific build directory via
-# include ../common.minheadless/Makefile.app
-#
-# Parameters:
-# VMSRCDIR defines the locaton of the VM source to build.  Required.
-#
-# COGDEFS supply any command-line defines to use, and may be null.
-#
-# The name of the VM to build, e.g. Squeak or "Newspeak Virtual Machine"
-# and its short name, e.g. Squeak or Newspeak, used to choose app icon files.
-
-VM?=Squeak
-SYSTEM?=$(VM)
-
-# PLUGINSRCDIR defines the locaton of the plugin source, the subsets of which
-# selected by plugins.int and plugins.ext will be built.
-
-PLUGINSRCDIR?=../../../src/plugins
-
-# CONFIGURATION defines what version of the VM to build, product, assert or
-# debug.  The default is overridden in the mvm script
-
-CONFIGURATION?=product
-
-
-#############################################################################
-# Build directories
-#
-
-ifeq ($(CONFIGURATION),assert)
-	BUILD:=buildast
-else ifeq ($(CONFIGURATION),debug)
-	BUILD:=builddbg
-else # default CONFIGURATION=product
-	BUILD:=build
-endif
-$(shell mkdir -p deps >/dev/null) # deps is the dependencies directory
-BLDDIR:= $(BUILD)
-OBJDIR:= $(BLDDIR)/vm
-
-PLATDIR:=../../../platforms
-CROSSDIR:=$(PLATDIR)/Cross/vm
-OSXDIR:=$(PLATDIR)/minheadless/unix
-OSXCOMMONDIR:=$(PLATDIR)/minheadless/common
-OSXSDLDIR:=$(PLATDIR)/minheadless/sdl2-window
-OSXPLUGINSDIR:=$(PLATDIR)/iOS/plugins
-
-MAKERSRC:=$(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c)
-CROSSSRC:= $(wildcard $(CROSSDIR)/*.c)
-OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.c) \
-		$(wildcard $(OSXDIR)/*.m) $(wildcard $(OSXCOMMONDIR)/*.m)
-OSXSDLSRC:= $(wildcard $(OSXSDLDIR)/*.c)
-VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(OSXSDLSRC)
-VMOBJ:=	$(notdir $(VMSRC))
-VMOBJ:=	$(VMOBJ:.c=.o)
-VMOBJ:=	$(VMOBJ:.m=.o)
-VMOBJ:=	$(VMOBJ:.cpp=.o)
-VMOBJ:= $(addprefix $(OBJDIR)/,$(VMOBJ))
-
-# N.B.  Most important that OSXCOMMONDIR precede OSXDIR so that the above
-# exclusion of OSXDIR/sqSqueakMainApplication+screen.m works, since there
-# exists a OSXCOMMONDIR/sqSqueakMainApplication+screen.m.
-SRCDIRS:=$(VMSRCDIR) $(OSXCOMMONDIR) $(OSXDIR) $(CROSSDIR) $(OSXSDLDIR)
-VPATH:=$(SRCDIRS)
-# Additonal includes are required, eg for SoundPlugin/sqSqueakSoundCoreAudio.h
-PluginIncludes := FilePlugin HostWindowPlugin SoundPlugin
-OSPluginIncludes := FilePlugin HostWindowPlugin SoundPlugin
-BLDDIRINC=$(BLDDIR)/include
-SRCDIRS:=$(SRCDIRS) \
-			$(BLDDIRINC) \
-			$(PLATDIR)/unix/vm \
-			$(PLATDIR)/../include \
-			$(addprefix $(PLATDIR)/Cross/plugins/,$(PluginIncludes)) \
-			$(addprefix $(OSXPLUGINSDIR)/,$(OSPluginIncludes))
-
-
-# The internal (.lib) and external (.bundle) plugins
-#
-include plugins.int
-include plugins.ext
-
-LIBS:= $(addprefix $(OBJDIR)/, $(addsuffix .lib, $(INTERNAL_PLUGINS)))
-BUNDLES:= $(addprefix $(OBJDIR)/, $(addsuffix .bundle, $(EXTERNAL_PLUGINS)))
-
-# VM config flags.
-ifeq ($(CONFIGURATION),debug)
-OFLAGS:= -g -O0 -fno-omit-frame-pointer
-DEBUGVM=-DDEBUGVM=1
-INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'
-else ifeq ($(CONFIGURATION),assert)
-OFLAGS:= -g -O1 -fno-omit-frame-pointer
-DEBUGVM=-DDEBUGVM=0
-INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'
-else # default CONFIGURATION=product
-OFLAGS:= -g -Os
-DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 # Define NDEBUG for production to exclude asserts
-INTERPFLAGS:=-D'VM_LABEL(foo)=0'
-endif
-
-TZ:=$(shell date +%Z)
-DEFS:=	$(COGDEFS) -DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \
-		-DUSE_INLINE_MEMORY_ACCESSORS -D'TZ="$(TZ)"' \
-		-DVM_NAME=\"$(APPNAME)\" \
-		$(INTERPFLAGS)
-
-# DEFS:=	$(COGDEFS) -DUSE_GLOBAL_STRUCT=0 -DNO_ISNAN=1 \
-# 		-DUSE_CORE_GRAPHICS=1 \
-# 		-DUSE_INLINE_MEMORY_ACCESSORS -D'TZ="$(TZ)"' \
-# 		$(INTERPFLAGS)
-
-XDEFS:=	-DSQUEAK_BUILTIN_PLUGIN
-CFLAGS:= $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(DEFS) $(XDEFS)
-INCLUDES:= $(addprefix -I,. $(SRCDIRS))
-
-#############################################################################
-# Linker settings
-#
-LD:=	 gcc
-
-#############################################################################
-#
-SVNREV:= $(shell sed -e "s/^static.*GitRawRevisionString.*Rev: \([0-9][0-9]*\).*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h)
-
-
-#############################################################################
-# Common build rules
-#
-include ../common.minheadless/Makefile.rules
-
-svnver:
-	@-echo $(SVNREV)
-
-getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqSCCSVersion.h
-	$(CC) -x c -DVERSION_PROGRAM=1 $(ALLFLAGS) $(INCLUDES) $< -o $@
-	$(POSTCOMPILE)
-
--include deps/version.d
-
-product:
-	$(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product $(@,product=) default
-
-assert:
-	$(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=assert $(@,assert=) default
-
-debug:
-	$(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=debug $(@,debug=) default
-
-cleanallvm:	cleanvm cleanvmast cleanvmdbg cleangv
-
-cleanvm:
-	rm -rf sqNamedPrims.h build deps
-
-cleanvmast:
-	rm -rf sqNamedPrims.h buildast
-
-cleanvmdbg:
-	rm -rf sqNamedPrims.h builddbg
-
-cleangv:
-	rm -rf getversion getversion.*
-
-print-source:
-	@echo ---------------- Makefile.vm sources ------------------
-	@echo CROSSSRC=$(CROSSSRC)
-	@echo OSXSRC=$(OSXSRC)
-	@echo MAKERSRC=$(MAKERSRC)
-	@echo UNIXSRC=$(UNIXSRC)
-	@echo VMSRC=$(VMSRC)
-
-print-settings:
-	@echo ---------------- Makefile.vm settings ------------------
-	@echo CONFIGURATION=$(CONFIGURATION)
-	@echo VPATH=$(VPATH)
-	@echo INCLUDES=$(INCLUDES)
-	@echo CFLAGS=$(CFLAGS)
-	@echo INTERNAL_PLUGINS=$(INTERNAL_PLUGINS)
-	@echo EXTERNAL_PLUGINS=$(EXTERNAL_PLUGINS)
-	@echo OBJDIR=$(OBJDIR)
-	@echo LIBS=$(LIBS)
-	@echo BUNDLES=$(BUNDLES)
-	@echo deps=$(patsubst %,deps/%.d,$(notdir $(basename $(VMSRC))))
-	@echo -----------------------------------------------------
-
-print-objects:
-	@echo ---------------- Makefile.vm objects ------------------
-	@echo VMOBJ=$(VMOBJ)
-	@echo -----------------------------------------------------
-
-ignore := $(addsuffix .%, $(basename $(wildcard $(BUILD)/vm/*.ignore)))
-
-$(OBJDIR)/$(VM): headers_built $(EXTRAVMLIBS) $(OBJDIR) $(VMOBJ) $(LIBS)
-	$(CC) -arch $(TARGET_ARCH) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(OSXCOMMONDIR)/version.c
-	$(CC) -arch $(TARGET_ARCH) -isysroot $(SDK) $(LDFLAGS) $(FRAMEWORKS) \
-			-o $(OBJDIR)/$(VM) $(VMOBJ) $(filter-out $(call ignore), $(LIBS))
-
-$(OBJDIR):
-	@-mkdir -p $(BLDDIR)
-	mkdir -p $(OBJDIR)
-ifneq ($(INTERNAL_PLUGINS),)
-	mkdir -p $(addprefix $(BLDDIR)/, $(INTERNAL_PLUGINS))
-endif
-ifneq ($(EXTERNAL_PLUGINS),)
-	mkdir -p $(addprefix $(BLDDIR)/, $(EXTERNAL_PLUGINS))
-endif
-
-#############################################################################
-# Building plugins
-#
-.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle $(OBJDIR)/%.dylib
-
-ifeq ($(USEPLUGINASDYLIB),TRUE)
-plugin-makefile = $(firstword $(realpath $(OSXPLUGINSDIR)/$(subst lib,,$(1))/Makefile ../common.minheadless/Makefile.plugin))
-else
-plugin-makefile = $(firstword $(realpath $(OSXPLUGINSDIR)/$(1)/Makefile ../common.minheadless/Makefile.plugin))
-endif
-
-# Internal plugin.  Build as lib then link in lib
-# Check for Makefile in iOS plugins directory otherwise use default Makefile
-# N.B.  PLATDIR *must* be a relative path for this to work
-$(OBJDIR)/%.lib: FORCE
-	@-mkdir -p $(BLDDIR)/$(*F)
-	test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true
-	rm -f $(BUILD)/vm/$(*F).ignore
-	$(MAKE) $(MFLAGS) BUILD=$(BUILD) \
-		-f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \
-		CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \
-		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
-		$(PLUGINHACK) \
-		$(OBJDIR)/$(*F).lib
-
-prereqs/%.lib:
-	@-ls -rlt	$(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) \
-				$(wildcard $(PLUGINSRCDIR)/$(*F)/*.c) \
-				$(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \
-				$(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*)
-
-# It would be nice to have this abbreviation but it creates havoc eem 2/2016
-#%.lib: $(OBJDIR)/%.lib
-#	make $(MAKEFLAGS) $<
-
-# External plugin.  Build as bundle and copy to vm dir ($(OBJDIR)).
-# Check for Makefile in iOS plugins directory otherwise use default Makefile
-$(OBJDIR)/%.bundle:	FORCE
-	@-mkdir -p $(BLDDIR)/$(*F)
-	test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true
-	rm -f $(BUILD)/vm/$(*F).ignore
-	$(MAKE) $(MFLAGS) BUILD=$(BUILD) \
-		-f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \
-		CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \
-		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		LIBNAME=$(*F) COGDEFS="$(COGDEFS)" \
-		APP=$(APP) VM=$(VM) BLDDIR=$(BLDDIR) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
-		$(PLUGINHACK) \
-		$(OBJDIR)/$(*F).bundle
-		
-# External plugin. Made in the "Pharo way": as a simple dylib to be included in 
-# Plugins directory
-$(OBJDIR)/%.dylib: FORCE
-	@-mkdir -p $(BLDDIR)/$(*F)
-	test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true
-	rm -f $(BUILD)/vm/$(*F).ignore
-	$(MAKE) $(MFLAGS) BUILD=$(BUILD) \
-		-f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \
-		CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \
-		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		LIBNAME=$(*F) COGDEFS="$(COGDEFS)" \
-		APP=$(APP) VM=$(VM) BLDDIR=$(BLDDIR) USEPLUGINASDYLIB=TRUE \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
-		$(PLUGINHACK) \
-		$(OBJDIR)/$(*F).dylib
-
-# It would be nice to have this abbreviation but it creates havoc eem 2/2016
-#%.bundle: $(OBJDIR)/%.bundle
-#	make $(MAKEFLAGS) $<
-
-FORCE:
-
-.PRECIOUS: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle
-
-#############################################################################
-# Extra specific dependencies
-#
-$(BLDDIRINC)/sqInternalPlugins.inc: plugins.int
-	mkdir -p $(BLDDIRINC)
-	../common.minheadless/mkInternalPluginsList.sh plugins.int > $(BLDDIRINC)/sqInternalPlugins.inc
-
-headers_built: $(BLDDIRINC)/config.h $(BLDDIRINC)/sqInternalPlugins.inc
-
-$(BLDDIRINC)/config.h:
-	mkdir -p $(BLDDIRINC)
-	mkdir -p CMakeFiles
-	cd CMakeFiles && cmake -DONLY_CONFIG_H=ON -DBUILD_I386_VERSION=ON ../../..
-	mv CMakeFiles/config.h $(BLDDIRINC)
diff --git a/building/macos32x86/common.minheadless/mkInternalPluginsList.sh b/building/macos32x86/common.minheadless/mkInternalPluginsList.sh
deleted file mode 100755
index 935c006880..0000000000
--- a/building/macos32x86/common.minheadless/mkInternalPluginsList.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-# Generate a sqInternalPlugins.inc file from plugins.int.  The plugins.int used should
-# be the one and only argument.
-if [ $# != 1 -o ! -f "$1" ]; then
-	echo usage $0 plugins.int \>sqNamedPrims.h 1>&2
-	exit 1
-fi
-for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | sed 's/ *\\\\//'`
-do
-	test -n "$p" && echo "INTERNAL_PLUGIN("$p")"
-done
diff --git a/building/macos32x86/common.minheadless/mkNamedPrims.sh b/building/macos32x86/common.minheadless/mkNamedPrims.sh
deleted file mode 100755
index 314f5b22c6..0000000000
--- a/building/macos32x86/common.minheadless/mkNamedPrims.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Generate a sqNamedPrims.h file from plugins.int.  The plugins.int used should
-# be the one and only argument.
-if [ $# != 1 -o ! -f "$1" ]; then
-	echo usage $0 plugins.int \>sqNamedPrims.h 1>&2
-	exit 1
-fi
-echo "/* Automatically generated on "`date`" */"
-echo "extern sqExport vm_exports[];";
-echo "extern sqExport os_exports[];";
-for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | sed 's/ *\\\\//'`
-do
-	test -n "$p" && echo "extern sqExport "$p"_exports[];"
-done
-echo
-echo "sqExport *pluginExports[] = {"
-echo "	vm_exports,"
-echo "	os_exports,"
-for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | sed 's/ *\\\\//'`
-do
-	echo "	"$p"_exports,"
-done
-echo "	NULL"
-echo "};"
diff --git a/building/macos32x86/pharo.cog.spur.minheadless/Makefile b/building/macos32x86/pharo.cog.spur.minheadless/Makefile
deleted file mode 100644
index 9d49530226..0000000000
--- a/building/macos32x86/pharo.cog.spur.minheadless/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-##############################################################################
-# Makefile for Mac OS X Cog Spur Pharo Cocoa VM using clang and gnu make 3.81
-# Do make init to allow make -n to function.
-#
-
-VMSRCDIR:=../../../src/spur32.cog
-VM:=Pharo
-COGDEFS:= -DPharoVM=1 -DIMMUTABILITY=1
-APPNAME:=Pharo
-APPNAMEDEF:=$(APPNAME)
-APPIDENTIFIER:=org.pharo.$(APPNAME)
-USEPLUGINASDYLIB:=TRUE
-THIRDPARTYLIBS:=pkgconfig zlib libpng freetype2 openssl libssh2 libgit2 libsdl2 pixman cairo
-EXTRAVMLIBS=libsdl2	
-
-.PHONY: pkgconfig zlib libpng freetype2 openssl libssh2 libgit2 libsdl2 pixman cairo
-
-# Now include the Makefile proper, which is common to all Mac OS builds.
-#
-include ../common.minheadless/Makefile.app
-
-# third-party libraries
-#
-include ../third-party/Makefile.pkgconfig
-include ../third-party/Makefile.zlib
-include ../third-party/Makefile.libpng
-include ../third-party/Makefile.freetype2
-include ../third-party/Makefile.openssl
-include ../third-party/Makefile.libssh2
-include ../third-party/Makefile.libgit2
-include ../third-party/Makefile.libsdl2
-include ../third-party/Makefile.pixman
-include ../third-party/Makefile.cairo
-
-# extras for headless VM to open world with SDL2
-# 
-CFLAGS+= -I$(THIRDPARTYINCLUDEDIR)/SDL2 -DHAVE_SDL2=1
-LDFLAGS+= -L$(THIRDPARTYOUTDIR)/lib -lSDL2
diff --git a/building/macos32x86/pharo.cog.spur.minheadless/mvm b/building/macos32x86/pharo.cog.spur.minheadless/mvm
deleted file mode 100755
index 9a2cda0cbc..0000000000
--- a/building/macos32x86/pharo.cog.spur.minheadless/mvm
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash -e
-A=;D=;F=
-if [ $# = 0 ]; then
-	A=1;D=1;F=1
-else
-	while getopts 'ASTadf?' opt "$@"; do
-		case $opt in
-		A)	A=1;D=1;F=1;;
-		S) echo -S not yet implemented\; use -A for now 1>&1; exit 1;;
-		T) echo -T not yet implemented\; use -A for now 1>&1; exit 1;;
-		a)	A=1;;
-		d)	D=1;;
-		f)	F=1;;
-		*)	echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;;
-		esac
-	done
-	if [ "$1" = -- ]; then
-		if [ "$A$D$F" = "" ]; then
-			A=1;D=1;F=1
-		fi
-	fi
-	shift `expr $OPTIND - 1`
-fi
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
-if [ -n "$D" ]; then
-	make $@ debug 2>&1 | tee LOGD ; test ${PIPESTATUS[0]} -eq 0
-fi
-if [ -n "$A" ]; then
-	make $@ assert 2>&1 | tee LOGA ; test ${PIPESTATUS[0]} -eq 0
-fi
-if [ -n "$F" ]; then
-	make $@ 2>&1 | tee LOGF ; test ${PIPESTATUS[0]} -eq 0
-fi
diff --git a/building/macos32x86/pharo.cog.spur.minheadless/plugins.ext b/building/macos32x86/pharo.cog.spur.minheadless/plugins.ext
deleted file mode 100644
index 666843b688..0000000000
--- a/building/macos32x86/pharo.cog.spur.minheadless/plugins.ext
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.ext
-EXTERNAL_PLUGINS = \
-B3DAcceleratorPlugin \
-ClipboardExtendedPlugin \
-CroquetPlugin \
-FT2Plugin \
-FloatMathPlugin \
-JPEGReadWriter2Plugin \
-JPEGReaderPlugin \
-LocalePlugin \
-Mpeg3Plugin \
-RePlugin \
-SqueakSSL \
-SurfacePlugin \
-UUIDPlugin \
-SerialPlugin \
-ObjectiveCPlugin \
-SDL2DisplayPlugin \
-EventsHandlerPlugin \
-VectorEnginePlugin \
-# TEMPORARY REMOVE
-# B3DAcceleratorPlugin \
-# could work, but I don't know if relevant:
-# TestOSAPlugin \
-# not working (because of Cocoa vs Carbon):
-# MIDIPlugin \
-# QuicktimePlugin \
-# JoystickTabletPlugin
diff --git a/building/macos32x86/pharo.cog.spur.minheadless/plugins.int b/building/macos32x86/pharo.cog.spur.minheadless/plugins.int
deleted file mode 100644
index b74cbdfb35..0000000000
--- a/building/macos32x86/pharo.cog.spur.minheadless/plugins.int
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.int
-INTERNAL_PLUGINS = \
-ADPCMCodecPlugin \
-AioPlugin \
-AsynchFilePlugin \
-B2DPlugin \
-BMPReadWriterPlugin \
-BitBltPlugin \
-DSAPrims \
-DropPlugin \
-FFTPlugin \
-FilePlugin \
-Float64ArrayPlugin \
-FloatArrayPlugin \
-GeniePlugin \
-IA32ABI \
-LargeIntegers \
-Matrix2x3Plugin \
-MiscPrimitivePlugin \
-SecurityPlugin \
-SocketPlugin \
-SoundCodecPrims \
-SoundGenerationPlugin \
-SqueakFFIPrims \
-StarSqueakPlugin \
-UnixOSProcessPlugin \
-VMProfileMacSupportPlugin \
-ZipPlugin \
-# Klatt
diff --git a/building/macos64ARMv8/pharo.stack.spur.lowcode/Makefile b/building/macos64ARMv8/pharo.stack.spur.lowcode/Makefile
deleted file mode 100644
index 029ceb2123..0000000000
--- a/building/macos64ARMv8/pharo.stack.spur.lowcode/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-##############################################################################
-# Makefile for Mac OS X Cog Spur Pharo Cocoa VM using clang and gnu make 3.81
-# Do make init to allow make -n to function.
-#
-
-VMSRCDIR:=../../../src/spur64.stack.lowcode
-VM:=Pharo
-COGDEFS:= -DPharoVM=1
-APPNAME:=Pharo
-APPNAMEDEF:=$(APPNAME)
-APPIDENTIFIER:=org.pharo.$(APPNAME)
-USEPLUGINASDYLIB:=TRUE
-THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libsdl2 pixman libpng cairo
-
-# Now include the Makefile proper, which is common to all Mac OS builds.
-#
-include ../common/Makefile.app
-
-# third-party libraries
-#
-include ../third-party/Makefile.pkgconfig
-include ../third-party/Makefile.freetype2
-include ../third-party/Makefile.openssl
-include ../third-party/Makefile.libssh2
-#include ../third-party/Makefile.libgit2
-include ../third-party/Makefile.libsdl2
-include ../third-party/Makefile.pixman
-include ../third-party/Makefile.libpng
-include ../third-party/Makefile.cairo
diff --git a/building/macos64ARMv8/pharo.stack.spur.lowcode/mvm b/building/macos64ARMv8/pharo.stack.spur.lowcode/mvm
deleted file mode 100755
index bd724e6930..0000000000
--- a/building/macos64ARMv8/pharo.stack.spur.lowcode/mvm
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-A=;D=;F=
-if [ $# = 0 ]; then
-	A=1;D=1;F=1
-else
-	while getopts 'ASTadf?' opt "$@"; do
-		case $opt in
-		A)	A=1;D=1;F=1;;
-		S) echo -S not yet implemented\; use -A for now 1>&1; exit 1;;
-		T) echo -T not yet implemented\; use -A for now 1>&1; exit 1;;
-		a)	A=1;;
-		d)	D=1;;
-		f)	F=1;;
-		*)	echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;;
-		esac
-	done
-	if [ "$1" = -- ]; then
-		if [ "$A$D$F" = "" ]; then
-			A=1;D=1;F=1
-		fi
-	fi
-	shift `expr $OPTIND - 1`
-fi
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
-if [ -n "$D" ]; then
-	make $@ debug 2>&1 | tee LOGD ; test ${PIPESTATUS[0]} -eq 0
-fi
-if [ -n "$A" ]; then
-	make $@ assert 2>&1 | tee LOGA ; test ${PIPESTATUS[0]} -eq 0
-fi
-if [ -n "$F" ]; then
-	make $@ 2>&1 | tee LOGF ; test ${PIPESTATUS[0]} -eq 0
-fi
diff --git a/building/macos64ARMv8/pharo.stack.spur.lowcode/plugins.ext b/building/macos64ARMv8/pharo.stack.spur.lowcode/plugins.ext
deleted file mode 100644
index 457a656a0e..0000000000
--- a/building/macos64ARMv8/pharo.stack.spur.lowcode/plugins.ext
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.ext
-EXTERNAL_PLUGINS = \
-ClipboardExtendedPlugin \
-CroquetPlugin \
-FT2Plugin \
-FloatMathPlugin \
-JPEGReadWriter2Plugin \
-JPEGReaderPlugin \
-LocalePlugin \
-Mpeg3Plugin \
-RePlugin \
-SqueakSSL \
-SurfacePlugin \
-UUIDPlugin \
-SerialPlugin \
-ObjectiveCPlugin \
-SDL2DisplayPlugin \
-EventsHandlerPlugin \
-VectorEnginePlugin \
-# Not working in 64bits (weird)
-# MIDIPlugin \
-# could work, but I don't know if relevant: \
-# TestOSAPlugin \
-# not working (because of Cocoa vs Carbon): \
-# B3DAcceleratorPlugin \
-# QuicktimePlugin \
-# JoystickTabletPlugin
diff --git a/building/macos64ARMv8/pharo.stack.spur.lowcode/plugins.int b/building/macos64ARMv8/pharo.stack.spur.lowcode/plugins.int
deleted file mode 100644
index 6a71cc4b3e..0000000000
--- a/building/macos64ARMv8/pharo.stack.spur.lowcode/plugins.int
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.int
-INTERNAL_PLUGINS = \
-ADPCMCodecPlugin \
-AioPlugin \
-AsynchFilePlugin \
-B2DPlugin \
-BMPReadWriterPlugin \
-BitBltPlugin \
-DSAPrims \
-DropPlugin \
-FFTPlugin \
-FilePlugin \
-FileAttributesPlugin \
-Float64ArrayPlugin \
-FloatArrayPlugin \
-GeniePlugin \
-HostWindowPlugin \
-IA32ABI \
-LargeIntegers \
-Matrix2x3Plugin \
-MiscPrimitivePlugin \
-SecurityPlugin \
-SocketPlugin \
-SoundCodecPrims \
-SoundGenerationPlugin \
-SoundPlugin \
-SqueakFFIPrims \
-StarSqueakPlugin \
-UnixOSProcessPlugin \
-VMProfileMacSupportPlugin \
-ZipPlugin \
-# Klatt 
diff --git a/building/macos64ARMv8/pharo.stack.spur/Makefile b/building/macos64ARMv8/pharo.stack.spur/Makefile
deleted file mode 100644
index 431489dd07..0000000000
--- a/building/macos64ARMv8/pharo.stack.spur/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-##############################################################################
-# Makefile for Mac OS X Cog Spur Pharo Cocoa VM using clang and gnu make 3.81
-# Do make init to allow make -n to function.
-#
-
-VMSRCDIR:=../../../src/spur64.stack
-VM:=Pharo
-COGDEFS:= -DPharoVM=1
-APPNAME:=Pharo
-APPNAMEDEF:=$(APPNAME)
-APPIDENTIFIER:=org.pharo.$(APPNAME)
-USEPLUGINASDYLIB:=TRUE
-THIRDPARTYLIBS:=pkgconfig freetype2 openssl libssh2 libgit2 libsdl2 pixman libpng cairo
-
-# Now include the Makefile proper, which is common to all Mac OS builds.
-#
-include ../common/Makefile.app
-
-# third-party libraries
-#
-include ../third-party/Makefile.pkgconfig
-include ../third-party/Makefile.freetype2
-include ../third-party/Makefile.openssl
-include ../third-party/Makefile.libssh2
-include ../third-party/Makefile.libgit2
-include ../third-party/Makefile.libsdl2
-include ../third-party/Makefile.pixman
-include ../third-party/Makefile.libpng
-include ../third-party/Makefile.cairo
diff --git a/building/macos64ARMv8/pharo.stack.spur/mvm b/building/macos64ARMv8/pharo.stack.spur/mvm
deleted file mode 100755
index bd724e6930..0000000000
--- a/building/macos64ARMv8/pharo.stack.spur/mvm
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-A=;D=;F=
-if [ $# = 0 ]; then
-	A=1;D=1;F=1
-else
-	while getopts 'ASTadf?' opt "$@"; do
-		case $opt in
-		A)	A=1;D=1;F=1;;
-		S) echo -S not yet implemented\; use -A for now 1>&1; exit 1;;
-		T) echo -T not yet implemented\; use -A for now 1>&1; exit 1;;
-		a)	A=1;;
-		d)	D=1;;
-		f)	F=1;;
-		*)	echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;;
-		esac
-	done
-	if [ "$1" = -- ]; then
-		if [ "$A$D$F" = "" ]; then
-			A=1;D=1;F=1
-		fi
-	fi
-	shift `expr $OPTIND - 1`
-fi
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
-if [ -n "$D" ]; then
-	make $@ debug 2>&1 | tee LOGD ; test ${PIPESTATUS[0]} -eq 0
-fi
-if [ -n "$A" ]; then
-	make $@ assert 2>&1 | tee LOGA ; test ${PIPESTATUS[0]} -eq 0
-fi
-if [ -n "$F" ]; then
-	make $@ 2>&1 | tee LOGF ; test ${PIPESTATUS[0]} -eq 0
-fi
diff --git a/building/macos64ARMv8/pharo.stack.spur/plugins.ext b/building/macos64ARMv8/pharo.stack.spur/plugins.ext
deleted file mode 100644
index 457a656a0e..0000000000
--- a/building/macos64ARMv8/pharo.stack.spur/plugins.ext
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.ext
-EXTERNAL_PLUGINS = \
-ClipboardExtendedPlugin \
-CroquetPlugin \
-FT2Plugin \
-FloatMathPlugin \
-JPEGReadWriter2Plugin \
-JPEGReaderPlugin \
-LocalePlugin \
-Mpeg3Plugin \
-RePlugin \
-SqueakSSL \
-SurfacePlugin \
-UUIDPlugin \
-SerialPlugin \
-ObjectiveCPlugin \
-SDL2DisplayPlugin \
-EventsHandlerPlugin \
-VectorEnginePlugin \
-# Not working in 64bits (weird)
-# MIDIPlugin \
-# could work, but I don't know if relevant: \
-# TestOSAPlugin \
-# not working (because of Cocoa vs Carbon): \
-# B3DAcceleratorPlugin \
-# QuicktimePlugin \
-# JoystickTabletPlugin
diff --git a/building/macos64ARMv8/pharo.stack.spur/plugins.int b/building/macos64ARMv8/pharo.stack.spur/plugins.int
deleted file mode 100644
index 6a71cc4b3e..0000000000
--- a/building/macos64ARMv8/pharo.stack.spur/plugins.int
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copied, perhaps edited, from ../../src/examplePlugins.int
-INTERNAL_PLUGINS = \
-ADPCMCodecPlugin \
-AioPlugin \
-AsynchFilePlugin \
-B2DPlugin \
-BMPReadWriterPlugin \
-BitBltPlugin \
-DSAPrims \
-DropPlugin \
-FFTPlugin \
-FilePlugin \
-FileAttributesPlugin \
-Float64ArrayPlugin \
-FloatArrayPlugin \
-GeniePlugin \
-HostWindowPlugin \
-IA32ABI \
-LargeIntegers \
-Matrix2x3Plugin \
-MiscPrimitivePlugin \
-SecurityPlugin \
-SocketPlugin \
-SoundCodecPrims \
-SoundGenerationPlugin \
-SoundPlugin \
-SqueakFFIPrims \
-StarSqueakPlugin \
-UnixOSProcessPlugin \
-VMProfileMacSupportPlugin \
-ZipPlugin \
-# Klatt