diff --git a/mps/code/spw3i3mv.c b/mps/code/spw3i3mv.c
deleted file mode 100644
index 3bb8ce94d0f..00000000000
--- a/mps/code/spw3i3mv.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* spw3i3mv.c: STACK PROBE FOR 32-BIT WINDOWS
- *
- * $Id$
- * Copyright (c) 2001-2014 Ravenbrook Limited. See end of file for license.
- * Portions copyright (C) 2001 Global Graphics Software.
- *
- * This function reads a location that is depth words beyond the
- * current stack pointer. On Intel platforms, the stack grows
- * downwards, so this means reading from a location with a lesser
- * address.
- */
-
-
-#include "mpm.h"
-
-
-void StackProbe(Size depth)
-{
- __asm {
- mov eax, depth
- neg eax
- mov eax, [esp+eax*4] /* do the actual probe */
- }
-}
-
-
-/* C. COPYRIGHT AND LICENSE
- *
- * Copyright (C) 2001-2014 Ravenbrook Limited .
- * All rights reserved. This is an open source license. Contact
- * Ravenbrook for commercial licensing options.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. Redistributions in any form must be accompanied by information on how
- * to obtain complete source code for this software and any accompanying
- * software that uses this software. The source code must either be
- * included in the distribution or be available for no more than the cost
- * of distribution plus a nominal fee, and must be freely redistributable
- * under reasonable conditions. For an executable file, complete source
- * code means the source code for all modules it contains. It does not
- * include source code for modules or files that typically accompany the
- * major components of the operating system on which the executable file
- * runs.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/mps/code/spw3i6mv.c b/mps/code/spw3i6mv.c
deleted file mode 100644
index 751e9680e4b..00000000000
--- a/mps/code/spw3i6mv.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* spw3i6mv.c: STACK PROBE FOR 64-BIT WINDOWS
- *
- * $Id$
- * Copyright (c) 2013 Ravenbrook Limited. See end of file for license.
- *
- * The function StackProbe ensures that the stack has at least depth
- * words available. It achieves this by exploiting an obscure but
- * documented feature of Microsoft's function _alloca: "A stack
- * overflow exception is generated if the space cannot be allocated."
- * _alloca: http://msdn.microsoft.com/en-us/library/wb1s57t5.aspx
- *
- * The purpose of this function to ensure that the stack overflow
- * exception is generated here (before taking the arena lock) where it
- * can be handled safely rather than at some later point where the
- * arena lock is held and so handling the exception may cause the MPS
- * to be entered recursively.
- */
-
-#include "mpm.h"
-#include
-
-void StackProbe(Size depth)
-{
- _alloca(depth*sizeof(Word));
-}
-
-
-/* C. COPYRIGHT AND LICENSE
- *
- * Copyright (C) 2013 Ravenbrook Limited .
- * All rights reserved. This is an open source license. Contact
- * Ravenbrook for commercial licensing options.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. Redistributions in any form must be accompanied by information on how
- * to obtain complete source code for this software and any accompanying
- * software that uses this software. The source code must either be
- * included in the distribution or be available for no more than the cost
- * of distribution plus a nominal fee, and must be freely redistributable
- * under reasonable conditions. For an executable file, complete source
- * code means the source code for all modules it contains. It does not
- * include source code for modules or files that typically accompany the
- * major components of the operating system on which the executable file
- * runs.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/mps/tool/gcovfmt.py b/mps/tool/gcovfmt.py
deleted file mode 100755
index 0f17bd0a353..00000000000
--- a/mps/tool/gcovfmt.py
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/python
-#
-# $Id$
-# Copyright (c) 2013 Ravenbrook Limited. See end of file for license.
-#
-# This program takes the output of gcov on standard input and writes a
-# human-readable table with a summary, to the file named on the
-# command line (or standard output if none is given). The summary line
-# is always written to standard output so that in the context of "make
-# test" where the detailed test output is being directed to a test log
-# file, the coverage summary can still be presented.
-#
-# gcov output looks like this:
-#
-# File '/project/mps/master/code/mpsi.c'
-# Lines executed:85.12% of 921
-# /project/mps/master/code/mpsi.c:creating 'mpsi.c.gcov'
-#
-# Note that we select only the .c files (there may also be output for
-# system files like signal.h with inline function definitions, and we
-# are not interested in covering them). The MPS has no inline function
-# definitions in headers.
-
-from sys import argv, stdin, stdout
-from re import match
-
-def coverage():
- """For each .c file with coverage data, generate a triple (percent
- coverage, file name, number of lines).
-
- """
- for line in stdin:
- m1 = match(r"File '.*/([^/]+\.c)'$", line)
- if not m1:
- continue
- m2 = match(r"Lines executed:(\d[0-9.]*)% of (\d+)$", next(stdin))
- if m2:
- yield float(m2.group(1)), m1.group(1), int(m2.group(2))
-
-def main():
- if len(argv) >= 2:
- out = open(argv[1], 'a')
- else:
- out = stdout
- fmt1 = "{0:<16s} {1:<7s} {2:<7s} {3:<7s}\n"
- fmt2 = "{0:<16s} {1:7d} {2:7d} {3:6.2f}%\n"
- underlines = "---------------- ------- ------- -------".split()
- out.write(fmt1.format(*"File Lines Covered Percent".split()))
- out.write(fmt1.format(*underlines))
- total_lines, total_covered = 0, 0
- for percent, file, lines in sorted(coverage()):
- covered = int(round(lines * percent / 100))
- total_lines += lines
- total_covered += covered
- out.write(fmt2.format(file, lines, covered, percent))
- out.write(fmt1.format(*underlines))
- if total_lines == 0:
- total_percent = 100.0
- else:
- total_percent = 100.0 * total_covered / total_lines
- summary = fmt2.format("COVERAGE TOTAL", total_lines, total_covered,
- total_percent)
- out.write(summary)
- if out != stdout:
- stdout.write(summary)
-
-if __name__ == '__main__':
- main()
-
-
-# C. COPYRIGHT AND LICENSE
-#
-# Copyright (C) 2013 Ravenbrook Limited .
-# All rights reserved. This is an open source license. Contact
-# Ravenbrook for commercial licensing options.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# 3. Redistributions in any form must be accompanied by information on how
-# to obtain complete source code for this software and any accompanying
-# software that uses this software. The source code must either be
-# included in the distribution or be available for no more than the cost
-# of distribution plus a nominal fee, and must be freely redistributable
-# under reasonable conditions. For an executable file, complete source
-# code means the source code for all modules it contains. It does not
-# include source code for modules or files that typically accompany the
-# major components of the operating system on which the executable file
-# runs.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-# PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.