diff --git a/mkworld/Jmakefile b/mkworld/Jmakefile
deleted file mode 100644
index 40a8c178f10d9e85a2873c83247c3f2fe553f408..0000000000000000000000000000000000000000
--- a/mkworld/Jmakefile
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */
diff --git a/mkworld/install-nofib-ghc.jm b/mkworld/install-nofib-ghc.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/install-nofib-ghc.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/install-nofib-hbc.jm b/mkworld/install-nofib-hbc.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/install-nofib-hbc.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/install-nofib-nhc.jm b/mkworld/install-nofib-nhc.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/install-nofib-nhc.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/install-nofib.jm b/mkworld/install-nofib.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/install-nofib.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/macros-nofib-ghc.jm b/mkworld/macros-nofib-ghc.jm
deleted file mode 100644
index e358d7f645c4781ad98211e70c5c0fe3544931bd..0000000000000000000000000000000000000000
--- a/mkworld/macros-nofib-ghc.jm
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef RunStdTestTimeCmd
-#define RunStdTestTimeCmd -ghc-timing
-#endif
diff --git a/mkworld/macros-nofib-hbc.jm b/mkworld/macros-nofib-hbc.jm
deleted file mode 100644
index bd2cb4e67010d52e93ecbe47c6ab3ed45b4525ea..0000000000000000000000000000000000000000
--- a/mkworld/macros-nofib-hbc.jm
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef RunStdTestTimeCmd
-#define RunStdTestTimeCmd -hbc-timing
-#endif
diff --git a/mkworld/macros-nofib-nhc.jm b/mkworld/macros-nofib-nhc.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/macros-nofib-nhc.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/macros-nofib.jm b/mkworld/macros-nofib.jm
deleted file mode 100644
index 9f1e117fc6a1b777e330f84f6d144d573970ccdd..0000000000000000000000000000000000000000
--- a/mkworld/macros-nofib.jm
+++ /dev/null
@@ -1,675 +0,0 @@
-#ifndef RunStdTestTimeCmd
-#define RunStdTestTimeCmd -t $(TIME)
-#endif
-
-#ifndef NoFibAt
-#define NoFibAt @
-#endif
-
-#ifndef ProjectMakeVarsForAllinSubdirs
-#define ProjectMakeVarsForAllinSubdirs HC="$(HC)" EXTRA_HC_OPTS="$(EXTRA_HC_OPTS)"
-#endif
-
-#ifndef ProjectMakeVarsForRunTestsinSubdirs
-#define ProjectMakeVarsForRunTestsinSubdirs HC="$(HC)" EXTRA_HC_OPTS="$(EXTRA_HC_OPTS)"
-#endif
-
-#ifndef NoFibHaskellCompile__
-#define NoFibHaskellCompile__(test,way,way_opts,module,isuf)		@@\
-CAT3(module,way,.o) : module.isuf					@@\
-	NoFibAt : do not $(RM) $@						@@\
-	@echo ==nofib== test\: time to compile $@ follows...		@@\
-	NoFibAt $(TIME) $(HC) -c -o $@ way_opts $(HCFLAGS) $(CAT2(HC_OPTS_,test)) $(CAT4(HC_OPTS_,test,_,module)) module.isuf @@\
-	@echo ==nofib== test\: size of $@ follows...			@@\
-	NoFibAt size $@
-#endif /* NoFibHaskellCompile__ */
-
-#ifndef NoFibLinkPgm__
-#define NoFibLinkPgm__(progname,way,way_opts,objlistvar)		     @@\
-CAT3(all_,progname,way) :: CAT2(progname,way)				     @@\
-CAT2(all,way) :: CAT2(progname,way)					     @@\
-									     @@\
-CAT2(progname,way) :: $(objlistvar)					     @@\
-	NoFibAt $(RM) CAT2(progname,way)				     @@\
-	NoFibAt $(HC) -o CAT2(progname,way) way_opts $(HCFLAGS) $(CAT2(HC_OPTS_,progname)) $(objlistvar) @@\
-	NoFibAt $(STRIP) CAT2(progname,way)				     @@\
-	@echo ==nofib== CAT2(progname,way)\: size of CAT2(progname,way) follows... @@\
-	NoFibAt size CAT2(progname,way)
-#endif /* NoFibLinkPgm__ */
-
-#ifndef NoFibRunPgm__
-#define NoFibRunPgm__(test,prog,way,runstdtest_opts)			@@\
-CAT3(runtest_,test,way) :: CAT2(prog,way)				@@\
-	@echo ==nofib== CAT2(prog,way)\: size of CAT2(prog,way) follows... @@\
-	NoFibAt size CAT2(prog,way)					@@\
-	@echo ==nofib== CAT2(test,way)\: time to run CAT2(prog,way) follows... @@\
-runtests:: CAT3(runtest_,test,way)					@@\
-CAT2(runtests,way) :: CAT3(runtest_,test,way)				@@\
-CAT3(runtest_,test,way)::						@@\
-	@$(RUNSTDTEST) CAT3(./,prog,way)		\		@@\
-		RunStdTestTimeCmd 			\		@@\
-		$(RUNSTDTEST_FLAGS) runstdtest_opts 	\		@@\
-		$(CAT2(NOFIB_RUN,way)) $(CAT2(NOFIB_RUN_,test))
-#endif /* NoFibRunPgm__ */
-
-#ifndef NoFibCleanupPgm__
-#define NoFibCleanupPgm__(prog,way,objlistvar)				@@\
-CAT3(clean_,prog,way) ::						@@\
-	$(RM) CAT2(prog,way) $(objlistvar)
-#endif /* NoFibCleanupPgm__ */
-
-#ifndef NoFibMultiModuleCompileAndRun__
-
-#define NoFibMultiModuleCompileAndRun__(testname,way,way_opts,runstdtest_opts)	@@\
-									@@\
-all :: CAT3(all_,testname,way)						@@\
-CAT2(all,way) :: CAT3(all_,testname,way)				@@\
-runtests :: CAT3(runtest_,testname,way)					@@\
-CAT2(runtests,way) :: CAT3(runtest_,testname,way)			@@\
-clean :: CAT3(clean_,testname,way)					@@\
-									@@\
-NoFibLinkPgm__(testname,way,way_opts,CAT2(OBJS_O,way))			@@\
-NoFibRunPgm__(testname,testname,way,runstdtest_opts)			@@\
-NoFibCleanupPgm__(testname,way,CAT2(OBJS_O,way))
-
-#endif /* NoFibMultiModuleCompileAndRun__ */
-
-#ifndef NoFibOneModuleCompileAndRun__
-#define NoFibOneModuleCompileAndRun__(testname,runopts,way,way_opts)	@@\
-									@@\
-NoFibMultiModuleCompileAndRun__(testname,way,way_opts,-o1 testname.stdout runopts) @@\
-									@@\
-NoFibHaskellCompile__(testname,way,way_opts,Main,hs)
-#endif /* NoFibOneModuleCompileAndRun__ */
-
-#ifndef NoFib_UserWay_a
-#define NoFib_UserWay_a NO
-#endif /* ! NoFib_UserWay_a */
-#ifndef NoFib_UserWay_b
-#define NoFib_UserWay_b NO
-#endif /* ! NoFib_UserWay_b */
-#ifndef NoFib_UserWay_c
-#define NoFib_UserWay_c NO
-#endif /* ! NoFib_UserWay_c */
-#ifndef NoFib_UserWay_d
-#define NoFib_UserWay_d NO
-#endif /* ! NoFib_UserWay_d */
-#ifndef NoFib_UserWay_e
-#define NoFib_UserWay_e NO
-#endif /* ! NoFib_UserWay_e */
-#ifndef NoFib_UserWay_f
-#define NoFib_UserWay_f NO
-#endif /* ! NoFib_UserWay_f */
-#ifndef NoFib_UserWay_g
-#define NoFib_UserWay_g NO
-#endif /* ! NoFib_UserWay_g */
-#ifndef NoFib_UserWay_h
-#define NoFib_UserWay_h NO
-#endif /* ! NoFib_UserWay_h */
-#ifndef NoFib_UserWay_i
-#define NoFib_UserWay_i NO
-#endif /* ! NoFib_UserWay_i */
-#ifndef NoFib_UserWay_j
-#define NoFib_UserWay_j NO
-#endif /* ! NoFib_UserWay_j */
-#ifndef NoFib_UserWay_k
-#define NoFib_UserWay_k NO
-#endif /* ! NoFib_UserWay_k */
-#ifndef NoFib_UserWay_l
-#define NoFib_UserWay_l NO
-#endif /* ! NoFib_UserWay_l */
-#ifndef NoFib_UserWay_m
-#define NoFib_UserWay_m NO
-#endif /* ! NoFib_UserWay_m */
-#ifndef NoFib_UserWay_n
-#define NoFib_UserWay_n NO
-#endif /* ! NoFib_UserWay_n */
-#ifndef NoFib_UserWay_o
-#define NoFib_UserWay_o NO
-#endif /* ! NoFib_UserWay_o */
-
-#if NoFib_UserWay_a == YES
-#define NoFibHaskellCompile_a(test,module,isuf) \
-	NoFibHaskellCompile__(test,_a,$(HC_OPTS_a),module,isuf)
-#define NoFibLinkPgm_a(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_a,$(HC_OPTS_a),objlistvar)
-#define NoFibRunPgm_a(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_a,runstdtest_opts)
-#define NoFibCleanupPgm_a(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_a,objlistvar)
-#define NoFibMultiModuleCompileAndRun_a(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_a,$(HC_OPTS_a),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_a(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_a,$(HC_OPTS_a))
-#define NoFibDependWay_a -s_a
-
-#else  /* ! NoFib_UserWay_a */
-#define NoFibHaskellCompile_a(test,module,isuf) /*none*/
-#define NoFibLinkPgm_a(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_a(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_a(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_a(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_a(testname,runopts) /*none*/
-#define NoFibDependWay_a /*none*/
-#endif /* ! NoFib_UserWay_a */
-
-#if NoFib_UserWay_b == YES
-#define NoFibHaskellCompile_b(test,module,isuf) \
-	NoFibHaskellCompile__(test,_b,$(HC_OPTS_b),module,isuf)
-#define NoFibLinkPgm_b(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_b,$(HC_OPTS_b),objlistvar)
-#define NoFibRunPgm_b(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_b,runstdtest_opts)
-#define NoFibCleanupPgm_b(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_b,objlistvar)
-#define NoFibMultiModuleCompileAndRun_b(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_b,$(HC_OPTS_b),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_b(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_b,$(HC_OPTS_b))
-#define NoFibDependWay_b -s_b
-
-#else  /* ! NoFib_UserWay_b */
-#define NoFibHaskellCompile_b(test,module,isuf) /*none*/
-#define NoFibLinkPgm_b(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_b(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_b(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_b(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_b(testname,runopts) /*none*/
-#define NoFibDependWay_b /*none*/
-#endif /* ! NoFib_UserWay_b */
-
-#if NoFib_UserWay_c == YES
-#define NoFibHaskellCompile_c(test,module,isuf) \
-	NoFibHaskellCompile__(test,_c,$(HC_OPTS_c),module,isuf)
-#define NoFibLinkPgm_c(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_c,$(HC_OPTS_c),objlistvar)
-#define NoFibRunPgm_c(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_c,runstdtest_opts)
-#define NoFibCleanupPgm_c(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_c,objlistvar)
-#define NoFibMultiModuleCompileAndRun_c(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_c,$(HC_OPTS_c),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_c(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_c,$(HC_OPTS_c))
-#define NoFibDependWay_c -s_c
-
-#else  /* ! NoFib_UserWay_c */
-#define NoFibHaskellCompile_c(test,module,isuf) /*none*/
-#define NoFibLinkPgm_c(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_c(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_c(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_c(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_c(testname,runopts) /*none*/
-#define NoFibDependWay_c /*none*/
-#endif /* ! NoFib_UserWay_c */
-
-#if NoFib_UserWay_d == YES
-#define NoFibHaskellCompile_d(test,module,isuf) \
-	NoFibHaskellCompile__(test,_d,$(HC_OPTS_d),module,isuf)
-#define NoFibLinkPgm_d(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_d,$(HC_OPTS_d),objlistvar)
-#define NoFibRunPgm_d(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_d,runstdtest_opts)
-#define NoFibCleanupPgm_d(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_d,objlistvar)
-#define NoFibMultiModuleCompileAndRun_d(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_d,$(HC_OPTS_d),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_d(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_d,$(HC_OPTS_d))
-#define NoFibDependWay_d -s_d
-
-#else  /* ! NoFib_UserWay_d */
-#define NoFibHaskellCompile_d(test,module,isuf) /*none*/
-#define NoFibLinkPgm_d(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_d(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_d(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_d(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_d(testname,runopts) /*none*/
-#define NoFibDependWay_d /*none*/
-#endif /* ! NoFib_UserWay_d */
-
-#if NoFib_UserWay_e == YES
-#define NoFibHaskellCompile_e(test,module,isuf) \
-	NoFibHaskellCompile__(test,_e,$(HC_OPTS_e),module,isuf)
-#define NoFibLinkPgm_e(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_e,$(HC_OPTS_e),objlistvar)
-#define NoFibRunPgm_e(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_e,runstdtest_opts)
-#define NoFibCleanupPgm_e(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_e,objlistvar)
-#define NoFibMultiModuleCompileAndRun_e(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_e,$(HC_OPTS_e),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_e(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_e,$(HC_OPTS_e))
-#define NoFibDependWay_e -s_e
-
-#else  /* ! NoFib_UserWay_e */
-#define NoFibHaskellCompile_e(test,module,isuf) /*none*/
-#define NoFibLinkPgm_e(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_e(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_e(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_e(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_e(testname,runopts) /*none*/
-#define NoFibDependWay_e /*none*/
-#endif /* ! NoFib_UserWay_e */
-
-#if NoFib_UserWay_f == YES
-#define NoFibHaskellCompile_f(test,module,isuf) \
-	NoFibHaskellCompile__(test,_f,$(HC_OPTS_f),module,isuf)
-#define NoFibLinkPgm_f(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,$(HC_OPTS_f),_f,objlistvar)
-#define NoFibRunPgm_f(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_f,runstdtest_opts)
-#define NoFibCleanupPgm_f(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_f,objlistvar)
-#define NoFibMultiModuleCompileAndRun_f(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_f,$(HC_OPTS_f),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_f(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_f,$(HC_OPTS_f)
-#define NoFibDependWay_f -s_f
-
-#else  /* ! NoFib_UserWay_f */
-#define NoFibHaskellCompile_f(test,module,isuf) /*none*/
-#define NoFibLinkPgm_f(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_f(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_f(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_f(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_f(testname,runopts) /*none*/
-#define NoFibDependWay_f /*none*/
-#endif /* ! NoFib_UserWay_f */
-
-#if NoFib_UserWay_g == YES
-#define NoFibHaskellCompile_g(test,module,isuf) \
-	NoFibHaskellCompile__(test,_g,$(HC_OPTS_g),module,isuf)
-#define NoFibLinkPgm_g(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,$(HC_OPTS_g),_g,objlistvar)
-#define NoFibRunPgm_g(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_g,runstdtest_opts)
-#define NoFibCleanupPgm_g(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_g,objlistvar)
-#define NoFibMultiModuleCompileAndRun_g(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_g,$(HC_OPTS_g),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_g(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_g,$(HC_OPTS_g))
-#define NoFibDependWay_g -s_g
-
-#else  /* ! NoFib_UserWay_g */
-#define NoFibHaskellCompile_g(test,module,isuf) /*none*/
-#define NoFibLinkPgm_g(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_g(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_g(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_g(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_g(testname,runopts) /*none*/
-#define NoFibDependWay_g /*none*/
-#endif /* ! NoFib_UserWay_g */
-
-#if NoFib_UserWay_h == YES
-#define NoFibHaskellCompile_h(test,module,isuf) \
-	NoFibHaskellCompile__(test,_h,$(HC_OPTS_h),module,isuf)
-#define NoFibLinkPgm_h(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_h,$(HC_OPTS_h),objlistvar)
-#define NoFibRunPgm_h(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_h,runstdtest_opts)
-#define NoFibCleanupPgm_h(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_h,objlistvar)
-#define NoFibMultiModuleCompileAndRun_h(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_h,$(HC_OPTS_h),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_h(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_h,$(HC_OPTS_h))
-#define NoFibDependWay_h -s_h
-
-#else  /* ! NoFib_UserWay_h */
-#define NoFibHaskellCompile_h(test,module,isuf) /*none*/
-#define NoFibLinkPgm_h(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_h(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_h(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_h(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_h(testname,runopts) /*none*/
-#define NoFibDependWay_h /*none*/
-#endif /* ! NoFib_UserWay_h */
-
-#if NoFib_UserWay_i == YES
-#define NoFibHaskellCompile_i(test,module,isuf) \
-	NoFibHaskellCompile__(test,_i,$(HC_OPTS_i),module,isuf)
-#define NoFibLinkPgm_i(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_i,$(HC_OPTS_i),objlistvar)
-#define NoFibRunPgm_i(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_i,runstdtest_opts)
-#define NoFibCleanupPgm_i(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_i,objlistvar)
-#define NoFibMultiModuleCompileAndRun_i(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_i,$(HC_OPTS_i),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_i(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_i,$(HC_OPTS_i))
-#define NoFibDependWay_i -s_i
-
-#else  /* ! NoFib_UserWay_i */
-#define NoFibHaskellCompile_i(test,module,isuf) /*none*/
-#define NoFibLinkPgm_i(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_i(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_i(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_i(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_i(testname,runopts) /*none*/
-#define NoFibDependWay_i /*none*/
-#endif /* ! NoFib_UserWay_i */
-
-#if NoFib_UserWay_j == YES
-#define NoFibHaskellCompile_j(test,module,isuf) \
-	NoFibHaskellCompile__(test,_j,$(HC_OPTS_j),module,isuf)
-#define NoFibLinkPgm_j(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_j,$(HC_OPTS_j),objlistvar)
-#define NoFibRunPgm_j(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_j,runstdtest_opts)
-#define NoFibCleanupPgm_j(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_j,objlistvar)
-#define NoFibMultiModuleCompileAndRun_j(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_j,$(HC_OPTS_j),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_j(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_j,$(HC_OPTS_j))
-#define NoFibDependWay_j -s_j
-
-#else  /* ! NoFib_UserWay_j */
-#define NoFibHaskellCompile_j(test,module,isuf) /*none*/
-#define NoFibLinkPgm_j(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_j(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_j(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_j(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_j(testname,runopts) /*none*/
-#define NoFibDependWay_j /*none*/
-#endif /* ! NoFib_UserWay_j */
-
-#if NoFib_UserWay_k == YES
-#define NoFibHaskellCompile_k(test,module,isuf) \
-	NoFibHaskellCompile__(test,_k,$(HC_OPTS_k),module,isuf)
-#define NoFibLinkPgm_k(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_k,$(HC_OPTS_k),objlistvar)
-#define NoFibRunPgm_k(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_k,runstdtest_opts)
-#define NoFibCleanupPgm_k(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_k,objlistvar)
-#define NoFibMultiModuleCompileAndRun_k(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_k,$(HC_OPTS_k),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_k(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_k,$(HC_OPTS_k))
-#define NoFibDependWay_k -s_k
-
-#else  /* ! NoFib_UserWay_k */
-#define NoFibHaskellCompile_k(test,module,isuf) /*none*/
-#define NoFibLinkPgm_k(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_k(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_k(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_k(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_k(testname,runopts) /*none*/
-#define NoFibDependWay_k /*none*/
-#endif /* ! NoFib_UserWay_k */
-
-#if NoFib_UserWay_l == YES
-#define NoFibHaskellCompile_l(test,module,isuf) \
-	NoFibHaskellCompile__(test,_l,$(HC_OPTS_l),module,isuf)
-#define NoFibLinkPgm_l(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_l,$(HC_OPTS_l),objlistvar)
-#define NoFibRunPgm_l(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_l,runstdtest_opts)
-#define NoFibCleanupPgm_l(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_l,objlistvar)
-#define NoFibMultiModuleCompileAndRun_l(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_l,$(HC_OPTS_l),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_l(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_l,$(HC_OPTS_l))
-#define NoFibDependWay_l -s_l
-
-#else  /* ! NoFib_UserWay_l */
-#define NoFibHaskellCompile_l(test,module,isuf) /*none*/
-#define NoFibLinkPgm_l(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_l(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_l(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_l(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_l(testname,runopts) /*none*/
-#define NoFibDependWay_l /*none*/
-#endif /* ! NoFib_UserWay_l */
-
-#if NoFib_UserWay_m == YES
-#define NoFibHaskellCompile_m(test,module,isuf) \
-	NoFibHaskellCompile__(test,_m,$(HC_OPTS_m),module,isuf)
-#define NoFibLinkPgm_m(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_m,$(HC_OPTS_m),objlistvar)
-#define NoFibRunPgm_m(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_m,runstdtest_opts)
-#define NoFibCleanupPgm_m(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_m,objlistvar)
-#define NoFibMultiModuleCompileAndRun_m(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_m,$(HC_OPTS_m),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_m(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_m,$(HC_OPTS_m))
-#define NoFibDependWay_m -s_m
-
-#else  /* ! NoFib_UserWay_m */
-#define NoFibHaskellCompile_m(test,module,isuf) /*none*/
-#define NoFibLinkPgm_m(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_m(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_m(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_m(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_m(testname,runopts) /*none*/
-#define NoFibDependWay_m /*none*/
-#endif /* ! NoFib_UserWay_m */
-
-#if NoFib_UserWay_n == YES
-#define NoFibHaskellCompile_n(test,module,isuf) \
-	NoFibHaskellCompile__(test,_n,$(HC_OPTS_n),module,isuf)
-#define NoFibLinkPgm_n(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_n,$(HC_OPTS_n),objlistvar)
-#define NoFibRunPgm_n(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_n,runstdtest_opts)
-#define NoFibCleanupPgm_n(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_n,objlistvar)
-#define NoFibMultiModuleCompileAndRun_n(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_n,$(HC_OPTS_n),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_n(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_n,$(HC_OPTS_n))
-#define NoFibDependWay_n -s_n
-
-#else  /* ! NoFib_UserWay_n */
-#define NoFibHaskellCompile_n(test,module,isuf) /*none*/
-#define NoFibLinkPgm_n(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_n(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_n(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_n(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_n(testname,runopts) /*none*/
-#define NoFibDependWay_n /*none*/
-#endif /* ! NoFib_UserWay_n */
-
-#if NoFib_UserWay_o == YES
-#define NoFibHaskellCompile_o(test,module,isuf) \
-	NoFibHaskellCompile__(test,_o,$(HC_OPTS_o),module,isuf)
-#define NoFibLinkPgm_o(target,progname,objlistvar) \
-	NoFibLinkPgm__(progname,_o,$(HC_OPTS_o),objlistvar)
-#define NoFibRunPgm_o(test,prog,runstdtest_opts) \
-	NoFibRunPgm__(test,prog,_o,runstdtest_opts)
-#define NoFibCleanupPgm_o(prog,objlistvar) \
-	NoFibCleanupPgm__(prog,_o,objlistvar)
-#define NoFibMultiModuleCompileAndRun_o(testname,runstdtest_opts) \
-	NoFibMultiModuleCompileAndRun__(testname,_o,$(HC_OPTS_o),runstdtest_opts)
-#define NoFibOneModuleCompileAndRun_o(testname,runopts) \
-	NoFibOneModuleCompileAndRun__(testname,runopts,_o,$(HC_OPTS_o))
-#define NoFibDependWay_o -s_o
-
-#else  /* ! NoFib_UserWay_o */
-#define NoFibHaskellCompile_o(test,module,isuf) /*none*/
-#define NoFibLinkPgm_o(target,progname,objlistvar) /*none*/
-#define NoFibRunPgm_o(test,prog,runstdtest_opts) /*none*/
-#define NoFibCleanupPgm_o(prog,objlistvar) /*none*/
-#define NoFibMultiModuleCompileAndRun_o(testname,runstdtest_opts) /*none*/
-#define NoFibOneModuleCompileAndRun_o(testname,runopts) /*none*/
-#define NoFibDependWay_o /*none*/
-#endif /* ! NoFib_UserWay_o */
-#ifndef NoFibHaskellCompile
-#define NoFibHaskellCompile(test,module,isuf)	\
-NoFibHaskellCompile__(test,,$(HC_OPTS_std),module,isuf) 	\
-NoFibHaskellCompile_a(test,module,isuf) 	\
-NoFibHaskellCompile_b(test,module,isuf) 	\
-NoFibHaskellCompile_c(test,module,isuf) 	\
-NoFibHaskellCompile_d(test,module,isuf) 	\
-NoFibHaskellCompile_e(test,module,isuf) 	\
-NoFibHaskellCompile_f(test,module,isuf) 	\
-NoFibHaskellCompile_g(test,module,isuf) 	\
-NoFibHaskellCompile_h(test,module,isuf)		\
-NoFibHaskellCompile_i(test,module,isuf)		\
-NoFibHaskellCompile_j(test,module,isuf)		\
-NoFibHaskellCompile_k(test,module,isuf)		\
-NoFibHaskellCompile_l(test,module,isuf)		\
-NoFibHaskellCompile_m(test,module,isuf)		\
-NoFibHaskellCompile_n(test,module,isuf)		\
-NoFibHaskellCompile_o(test,module,isuf)
-#endif /* NoFibHaskellCompile */
-#ifndef NoFibLinkPgm
-#define NoFibLinkPgm(target,progname,objlistvar)	\
-NoFibLinkPgm__(target,progname,$(HC_OPTS_std),objlistvar)		\
-NoFibLinkPgm_a(target,progname,objlistvar)		\
-NoFibLinkPgm_b(target,progname,objlistvar)		\
-NoFibLinkPgm_c(target,progname,objlistvar)		\
-NoFibLinkPgm_d(target,progname,objlistvar)		\
-NoFibLinkPgm_e(target,progname,objlistvar)		\
-NoFibLinkPgm_f(target,progname,objlistvar)		\
-NoFibLinkPgm_g(target,progname,objlistvar)		\
-NoFibLinkPgm_h(target,progname,objlistvar)		\
-NoFibLinkPgm_i(target,progname,objlistvar)		\
-NoFibLinkPgm_j(target,progname,objlistvar)		\
-NoFibLinkPgm_k(target,progname,objlistvar)		\
-NoFibLinkPgm_l(target,progname,objlistvar)		\
-NoFibLinkPgm_m(target,progname,objlistvar)		\
-NoFibLinkPgm_n(target,progname,objlistvar)		\
-NoFibLinkPgm_o(target,progname,objlistvar)
-#endif /* NoFibLinkPgm */
-#ifndef NoFibRunPgm
-#define NoFibRunPgm(test,prog,runstdtest_opts)	\
-NoFibRunPgm__(test,prog,,runstdtest_opts)	\
-NoFibRunPgm_a(test,prog,runstdtest_opts)	\
-NoFibRunPgm_b(test,prog,runstdtest_opts)	\
-NoFibRunPgm_c(test,prog,runstdtest_opts)	\
-NoFibRunPgm_d(test,prog,runstdtest_opts)	\
-NoFibRunPgm_e(test,prog,runstdtest_opts)	\
-NoFibRunPgm_f(test,prog,runstdtest_opts)	\
-NoFibRunPgm_g(test,prog,runstdtest_opts)	\
-NoFibRunPgm_h(test,prog,runstdtest_opts)	\
-NoFibRunPgm_i(test,prog,runstdtest_opts)	\
-NoFibRunPgm_j(test,prog,runstdtest_opts)	\
-NoFibRunPgm_k(test,prog,runstdtest_opts)	\
-NoFibRunPgm_l(test,prog,runstdtest_opts)	\
-NoFibRunPgm_m(test,prog,runstdtest_opts)	\
-NoFibRunPgm_n(test,prog,runstdtest_opts)	\
-NoFibRunPgm_o(test,prog,runstdtest_opts)
-#endif /* NoFibRunPgm */
-#ifndef NoFibCleanupPgm
-#define NoFibCleanupPgm(prog,objlistvar)	\
-NoFibCleanupPgm__(prog,,objlistvar)		\
-NoFibCleanupPgm_a(prog,objlistvar)		\
-NoFibCleanupPgm_b(prog,objlistvar)		\
-NoFibCleanupPgm_c(prog,objlistvar)		\
-NoFibCleanupPgm_d(prog,objlistvar)		\
-NoFibCleanupPgm_e(prog,objlistvar)		\
-NoFibCleanupPgm_f(prog,objlistvar)		\
-NoFibCleanupPgm_g(prog,objlistvar)		\
-NoFibCleanupPgm_h(prog,objlistvar)		\
-NoFibCleanupPgm_i(prog,objlistvar)		\
-NoFibCleanupPgm_j(prog,objlistvar)		\
-NoFibCleanupPgm_k(prog,objlistvar)		\
-NoFibCleanupPgm_l(prog,objlistvar)		\
-NoFibCleanupPgm_m(prog,objlistvar)		\
-NoFibCleanupPgm_n(prog,objlistvar)		\
-NoFibCleanupPgm_o(prog,objlistvar)
-#endif /* NoFibCleanupPgm */
-#ifndef NoFibMultiModuleCompileAndRun
-#define NoFibMultiModuleCompileAndRun(testname,runstdtest_opts)	@@\
-								@@\
-OBJS_O_a = $(OBJS_O:.o=_a.o)					@@\
-OBJS_O_b = $(OBJS_O:.o=_b.o)					@@\
-OBJS_O_c = $(OBJS_O:.o=_c.o)					@@\
-OBJS_O_d = $(OBJS_O:.o=_d.o)					@@\
-OBJS_O_e = $(OBJS_O:.o=_e.o)					@@\
-OBJS_O_f = $(OBJS_O:.o=_f.o)					@@\
-OBJS_O_g = $(OBJS_O:.o=_g.o)					@@\
-OBJS_O_h = $(OBJS_O:.o=_h.o)					@@\
-OBJS_O_i = $(OBJS_O:.o=_i.o)					@@\
-OBJS_O_j = $(OBJS_O:.o=_j.o)					@@\
-OBJS_O_k = $(OBJS_O:.o=_k.o)					@@\
-OBJS_O_l = $(OBJS_O:.o=_l.o)					@@\
-OBJS_O_m = $(OBJS_O:.o=_m.o)					@@\
-OBJS_O_n = $(OBJS_O:.o=_n.o)					@@\
-OBJS_O_o = $(OBJS_O:.o=_o.o)					@@\
-								@@\
-SuffixRule_o_hi() /* ToDo: this looks semi-useless */		\
-								@@\
-runtests ::							@@\
-	@echo ==nofib== testname\: running in $(CURRENT_DIR)	\
-NoFibMultiModuleCompileAndRun__(testname,,$(HC_OPTS_std),runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_a(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_b(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_c(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_d(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_e(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_f(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_g(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_h(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_i(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_j(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_k(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_l(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_m(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_n(testname,runstdtest_opts)	\
-NoFibMultiModuleCompileAndRun_o(testname,runstdtest_opts)
-#endif /* NoFibMultiModuleCompileAndRun */
-#ifndef NoFibOneModuleCompileAndRun
-#define NoFibOneModuleCompileAndRun(testname,runopts) @@\
-OBJS_O = Main.o					@@\
-						@@\
-OBJS_O_a = $(OBJS_O:.o=_a.o)			@@\
-OBJS_O_b = $(OBJS_O:.o=_b.o)			@@\
-OBJS_O_c = $(OBJS_O:.o=_c.o)			@@\
-OBJS_O_d = $(OBJS_O:.o=_d.o)			@@\
-OBJS_O_e = $(OBJS_O:.o=_e.o)			@@\
-OBJS_O_f = $(OBJS_O:.o=_f.o)			@@\
-OBJS_O_g = $(OBJS_O:.o=_g.o)			@@\
-OBJS_O_h = $(OBJS_O:.o=_h.o)			@@\
-OBJS_O_i = $(OBJS_O:.o=_i.o)			@@\
-OBJS_O_j = $(OBJS_O:.o=_j.o)			@@\
-OBJS_O_k = $(OBJS_O:.o=_k.o)			@@\
-OBJS_O_l = $(OBJS_O:.o=_l.o)			@@\
-OBJS_O_m = $(OBJS_O:.o=_m.o)			@@\
-OBJS_O_n = $(OBJS_O:.o=_n.o)			@@\
-OBJS_O_o = $(OBJS_O:.o=_o.o)			\
-						\
-NoFibOneModuleCompileAndRun__(testname,runopts,,$(HC_OPTS_std))	\
-NoFibOneModuleCompileAndRun_a(testname,runopts)	\
-NoFibOneModuleCompileAndRun_b(testname,runopts)	\
-NoFibOneModuleCompileAndRun_c(testname,runopts)	\
-NoFibOneModuleCompileAndRun_d(testname,runopts)	\
-NoFibOneModuleCompileAndRun_e(testname,runopts)	\
-NoFibOneModuleCompileAndRun_f(testname,runopts)	\
-NoFibOneModuleCompileAndRun_g(testname,runopts)	\
-NoFibOneModuleCompileAndRun_h(testname,runopts) \
-NoFibOneModuleCompileAndRun_i(testname,runopts) \
-NoFibOneModuleCompileAndRun_j(testname,runopts) \
-NoFibOneModuleCompileAndRun_k(testname,runopts) \
-NoFibOneModuleCompileAndRun_l(testname,runopts) \
-NoFibOneModuleCompileAndRun_m(testname,runopts) \
-NoFibOneModuleCompileAndRun_n(testname,runopts) \
-NoFibOneModuleCompileAndRun_o(testname,runopts)
-#endif /* NoFibOneModuleCompileAndRun */
-#ifndef NoFibDependWays
-#define NoFibDependWays \
-NoFibDependWay_a NoFibDependWay_b NoFibDependWay_c \
-NoFibDependWay_d NoFibDependWay_e NoFibDependWay_f \
-NoFibDependWay_g NoFibDependWay_h NoFibDependWay_i \
-NoFibDependWay_j NoFibDependWay_k NoFibDependWay_l \
-NoFibDependWay_m NoFibDependWay_n NoFibDependWay_o
-#endif
-
-#ifndef NoFibDependTarget
-#define NoFibDependTarget(test,deps)				@@\
-MkDependHSNeededHere(depend)					@@\
-								@@\
-MKDEPENDWAYFLAGS = NoFibDependWays				@@\
-								@@\
-depend:: deps							@@\
-	$(MKDEPENDHS) $(MKDEPENDWAYFLAGS) $(MKDEPENDHSFLAGS) -- $(HCFLAGS) $(CAT2(HC_OPTS_,test)) -- deps
-#endif /* NoFibDependTarget */
diff --git a/mkworld/only4-nofib-ghc.jm b/mkworld/only4-nofib-ghc.jm
deleted file mode 100644
index 26d52d890aa35c6c4a9195bde6d722ec53324a35..0000000000000000000000000000000000000000
--- a/mkworld/only4-nofib-ghc.jm
+++ /dev/null
@@ -1,256 +0,0 @@
-#ifndef GhcVersionInUse
-# define GhcVersionInUse 27
-#endif
-
-#if GhcVersionInUse >= 19
-# define if19plus(x) x
-#else
-# define if19plus(x) /*nothing*/
-#endif
-
-#if GhcVersionInUse >= 24
-# define if24plus(x) x
-#else
-# define if24plus(x) /*nothing*/
-#endif
-
-#if GhcVersionInUse >= 27
-# define if27plus(x) x
-#else
-# define if27plus(x) /*nothing*/
-#endif
-
-/* these flags worked all the way back to 0.10: */
-#define _Hm(n) CAT3(-Rmax-heapsize,n,000000)
-#define _Km(n) CAT3(-Rmax-stksize,n,000000)
-#define _Kk(n) CAT3(-Rmax-stksize,n,000)
-HC_OPTS_anna	= _Hm(16)
-HC_OPTS_anna_BaseDefs = -cpp
-
-HC_OPTS_bspt_BSPT	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_Euclid	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_EuclidGMS	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_GeomNum	= if27plus(-fno-all-strict) -cpp
-HC_OPTS_bspt_Init	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_Input	= if27plus(-fno-all-strict) _Hm(24)
-HC_OPTS_bspt_Interface	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_Interpret	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_Libfuns	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_MGRlib	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_Main	= if27plus(-fno-all-strict) -cpp
-HC_OPTS_bspt_Merge	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_Params	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_Prog	= if27plus(-fno-all-strict) -cpp
-HC_OPTS_bspt_Rationals	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_Render	= if27plus(-fno-all-strict)
-HC_OPTS_bspt_Stdlib	= if27plus(-fno-all-strict)
-
-HC_OPTS_compress_Encode  = -cpp _Hm(12)
-HC_OPTS_compress2 = -cpp if19plus(-syslib hbc)
-HC_OPTS_compress2_WriteRoutines = if24plus(-monly-4-regs)
-NOFIB_RUN_compress2 = +RTS -H16m -RTS
-
-HC_OPTS_fluid	= _Hm(12)
-HC_OPTS_fluid_Main = -cpp
-
-HC_OPTS_gg	= _Hm(12)
-
-HC_OPTS_HMMS	= if19plus(-syslib hbc)
-HC_OPTS_HMMS_MaybeStateT = -cpp
-HC_OPTS_HMMS_BatchAlign = -cpp
-
-HC_OPTS_hpg	= _Hm(8)
-HC_OPTS_infer	= _Km(2)
-HC_OPTS_lift	= _Hm(8) _Km(1)
-HC_OPTS_mkhprog	= _Hm(12)
-HC_OPTS_parser	= _Hm(30) _Km(1)
-HC_OPTS_prolog	= _Hm(8)
-HC_OPTS_reptile	= _Hm(10) _Km(1)
-HC_OPTS_simple  = _Hm(12)
-
-HC_OPTS_veritas	= _Hm(14) _Km(1)
-HC_OPTS_veritas_Main	= -cpp
-HC_OPTS_veritas_Parse	= _Hm(18)
-
-NOFIB_RUN_symalg = +RTS -H64m -RTS
-HC_OPTS_awards = if19plus(-syslib hbc)
-HC_OPTS_boyer_Main = _Hm(16)
-HC_OPTS_cichelli = -cpp
-HC_OPTS_fibheaps = -fglasgow-exts -cpp
-NOFIB_RUN_fibheaps = +RTS -K2m -RTS
-HC_OPTS_knights_Sort = -cpp
-HC_OPTS_knights_ChessSetList = _Hm(14)
-HC_OPTS_multiplier_Main = _Hm(14)
-HC_OPTS_minimax = -cpp
-HC_OPTS_rewrite_Main = _Hm(14)
-/* HC_OPTS_fft_Word = -fglasgow-exts */
-
-HC_OPTS_comp_lab_zift	= -cpp if19plus(-syslib hbc)
-HC_OPTS_event		= -cpp if19plus(-syslib hbc)
-HC_OPTS_fft		= -cpp if19plus(-syslib hbc) if24plus(-monly-4-regs)
-HC_OPTS_genfft		= -cpp if19plus(-syslib hbc) if24plus(-monly-4-regs)
-HC_OPTS_ida		= -cpp if19plus(-syslib hbc)
-HC_OPTS_listcompr	= -cpp if19plus(-syslib hbc)
-HC_OPTS_listcopy	= -cpp if19plus(-syslib hbc)
-HC_OPTS_parstof		= -cpp if19plus(-syslib hbc) _Hm(30) _Km(1) if24plus(-monly-4-regs)
-HC_OPTS_sched		= -cpp if19plus(-syslib hbc)
-HC_OPTS_solid		= -cpp if19plus(-syslib hbc) _Hm(30) _Km(3)
-HC_OPTS_transform	= -cpp if19plus(-syslib hbc) _Hm(12)
-HC_OPTS_typecheck	= -cpp if19plus(-syslib hbc)
-HC_OPTS_wang		= -cpp if19plus(-syslib hbc)
-HC_OPTS_wave4main	= -cpp if19plus(-syslib hbc) _Hm(12) if24plus(-monly-4-regs)
-
-HC_OPTS_nucleic2	= -cpp /*-DUSE_UNBOXED_FLOATS -DUSE_GLASGOW_HACKS*/ /*nope:-DUSE_HARTEL_LAZINESS*/ -fglasgow-exts
-
-HC_OPTS_editor3 = if19plus(-syslib posix)
-
-HC_OPTS_haskelldraw = -fglasgow-exts -L/usr/openwin/lib -L/usr/X11/lib -lXol -lXt -lXpm -lX11
-
-HC_OPTS_happy = -cpp -fglasgow-exts
-
-HC_OPTS_lolita = -cpp if19plus(-syslib hbc) if19plus(-syslib ghc) -fglasgow-exts -iutils:StaticNet:controls:tomita
-HC_OPTS_lolita_FeatureType = -Onot _Km(4) /* sigh */
-HC_OPTS_lolita_Roles = _Km(4)
-HC_OPTS_lolita_IMain = _Km(4)
-HC_OPTS_lolita_Dial_EmCausePB = -fno-update-analysis /* sigh */
-HC_OPTS_lolita_Dial_EmShowPB = -fno-update-analysis /* sigh */
-HC_OPTS_lolita_Dial_EmReact = -fno-update-analysis /* sigh */
-HC_OPTS_lolita_ExtractRootItal = -fno-update-analysis /* sigh */
-
-HC_OPTS_nhccomp = -cpp if19plus(-syslib hbc)
-HC_OPTS_linsolv = -fglasgow-exts -cpp -UNO_FILTER -DASYM_CRA -DGUM -DPAR_DET_SZ=4 -DINPUT_SIZE=4
-HC_OPTS_dcbm    = -fglasgow-exts -cpp -DPAR 
-NOFIB_RUN_fulsom  = +RTS -H12m -RTS
-
-NOFIB_RUN_gamteb  = +RTS -K1500k -RTS	/* SIGH */
-
-NOFIB_RUN_hidden  = +RTS -K1m -RTS	/* fairly random number; SIGH */
-
-/*??? NOFIB_RUN_HMMS	  = +RTS -H54M -K1M -RTS*/
-NOFIB_RUN_reptile = +RTS -H6m -RTS
-
-NOFIB_RUN_life	   = +RTS -H32m -RTS
-
-NOFIB_RUN_maillist = +RTS -K100k -RTS
-
-NOFIB_RUN_cichelli = +RTS -H6m -RTS
-
-NOFIB_RUN_comp_lab_zift	= +RTS -H20m -K10m -RTS
-NOFIB_RUN_event		= +RTS -H24m -K4500k -RTS
-NOFIB_RUN_fft		= +RTS -H24m -K1m -RTS
-NOFIB_RUN_genfft	= +RTS -H20m -K10m -RTS
-NOFIB_RUN_ida		= +RTS -H24m -K1m -RTS
-NOFIB_RUN_listcompr	= +RTS -H24m -K1m -RTS
-NOFIB_RUN_listcopy	= +RTS -H24m -K1m -RTS
-NOFIB_RUN_parstof	= +RTS -H24m -K1m -RTS
-NOFIB_RUN_sched		= +RTS -H24m -K1m -RTS
-NOFIB_RUN_solid		= +RTS -H24m -K1m -RTS
-NOFIB_RUN_transform	= +RTS -H24m -K1m -RTS
-NOFIB_RUN_typecheck	= +RTS -H24m -K6m -RTS
-NOFIB_RUN_wang		= +RTS -H24m -K6m -RTS
-NOFIB_RUN_wave4main	= +RTS -H24m -K1m -RTS
-
-NOFIB_RUN_clausify  = +RTS -K200k -RTS
-
-NOFIB_RUN_simple    = +RTS -H16m -K1m -RTS
-
-NOFIB_RUN_treejoin  = +RTS -H32m -K2m
-
-NOFIB_RUN_exp3_8    = +RTS -K300k -RTS
-NOFIB_RUN_primes    = +RTS -H16m -RTS
-
-/* **********  END OF all that follows ... ************* */
-#if IncludeGHC_ONLYNoFibTests == YES
-
-HC_OPTS_cg012 = -fglasgow-exts
-HC_OPTS_cg015 = -fglasgow-exts
-HC_OPTS_cg018 = -fglasgow-exts
-HC_OPTS_cg025 = if19plus(-syslib hbc)
-HC_OPTS_cg026 = -fglasgow-exts
-HC_OPTS_cg029 = -fglasgow-exts
-HC_OPTS_cg030 = -fglasgow-exts
-HC_OPTS_cg031 = -fglasgow-exts
-HC_OPTS_cg032 = -fglasgow-exts
-HC_OPTS_cg033 = -fglasgow-exts
-HC_OPTS_cg035 = -fglasgow-exts -fvia-C /*'-#include"math.h"'*/
-HC_OPTS_cg036 = -fglasgow-exts
-
-HC_OPTS_ghclib001 = if19plus(-syslib ghc)
-NOFIB_RUN_ghclib001 = +RTS -H16m -K8m -RTS
-
-NOFIB_RUN_cg021 = +RTS -H15000k -K4500k -RTS
-
-NOFIB_RUN_cg022 = +RTS -H10m -RTS
-
-HC_OPTS_cg023 = _Hm(14)
-NOFIB_RUN_cg023 = +RTS -H32k -RTS
-	/* the whole point of cg023 is that it runs in small space */
-
-HC_OPTS_arith005 = -cpp -fno-update-analysis/*sigh*/
-
-HC_OPTS_io009 = if19plus(-syslib hbc)
-HC_OPTS_io012 = if19plus(-syslib ghc)
-HC_OPTS_io018 = if19plus(-syslib ghc)
-HC_OPTS_io019 = if19plus(-syslib ghc -syslib posix)
-HC_OPTS_io020 = if19plus(-syslib ghc -syslib posix)
-
-HC_OPTS_po001 = if19plus(-syslib posix -syslib ghc)
-HC_OPTS_po002 = if19plus(-syslib posix)
-HC_OPTS_po003 = if19plus(-syslib posix)
-HC_OPTS_po004 = if19plus(-syslib posix) -fvia-C
-HC_OPTS_po005 = if19plus(-syslib posix)
-HC_OPTS_po006 = if19plus(-syslib posix)
-HC_OPTS_po007 = if19plus(-syslib posix) -fvia-C
-HC_OPTS_po008 = if19plus(-syslib posix) -fvia-C
-HC_OPTS_po009 = if19plus(-syslib posix) -fvia-C
-HC_OPTS_po010 = if19plus(-syslib posix)
-HC_OPTS_po011 = if19plus(-syslib posix)
-HC_OPTS_po012 = if19plus(-syslib posix) -fvia-C /*??? '-#include"libposix.h"' */
-
-HC_OPTS_net001 = if19plus(-syslib ghc)
-HC_OPTS_net002 = if19plus(-syslib ghc)
-HC_OPTS_net003 = if19plus(-syslib ghc)
-HC_OPTS_net004 = if19plus(-syslib ghc)
-HC_OPTS_net005 = if19plus(-syslib ghc)
-HC_OPTS_net006 = if19plus(-syslib ghc)
-HC_OPTS_net007 = if19plus(-syslib ghc) if19plus(-syslib posix)
-HC_OPTS_net008 = if19plus(-syslib ghc) if19plus(-syslib posix)
-
-HC_OPTS_stable001 = -fvia-C -fglasgow-exts
-NOFIB_RUN_stable001 = +RTS -H10k -RTS
-
-/* specialisation tests, esp for unboxed specialisation */
-HC_OPTS_spec001	    = -fglasgow-exts
-HC_OPTS_spec003	    = -fglasgow-exts
-HC_OPTS_clausify001 = -fglasgow-exts
-HC_OPTS_clausify002 = -fglasgow-exts
-HC_OPTS_clausify003 = -fglasgow-exts
-
-/* keep the heap down on 10queens in the hope it will not "loop" */
-NOFIB_RUN_10queens = +RTS -H1m -RTS
-
-HC_OPTS_fast2haskell = _Hm(20)
-HC_OPTS_fast2haskell_Word2 = -fglasgow-exts
-
-HC_OPTS_cvh_unboxing = -fglasgow-exts
-
-HC_OPTS_areid_pass = -fglasgow-exts
-
-NOFIB_RUN_jules_xref = +RTS -K1m -H20m -RTS
-
-NOFIB_RUN_life_space_leak = +RTS -H32m -RTS
-
-HC_OPTS_north_lias = _Hm(32)
-
-HC_OPTS_zhang_ccall = -fglasgow-exts
-
-HC_OPTS_dmgob_native1 = if19plus(-syslib hbc)
-HC_OPTS_dmgob_native1_MaybeStateT = -cpp
-
-HC_OPTS_dmgob_native2 = if19plus(-syslib hbc) -cpp
-
-HC_OPTS_andy_cherry = -cpp
-HC_OPTS_ipoole_spec_class = -cpp
-HC_OPTS_waugh_neural = if19plus(-syslib hbc)
-
-#endif /* IncludeGHC_ONLYNoFibTests */
diff --git a/mkworld/only4-nofib-hbc.jm b/mkworld/only4-nofib-hbc.jm
deleted file mode 100644
index 112dfbf3c7178f63a6a2f77bd1e06a86651a9285..0000000000000000000000000000000000000000
--- a/mkworld/only4-nofib-hbc.jm
+++ /dev/null
@@ -1,61 +0,0 @@
-HC_OPTS_anna = HaskellCompilerHeapSize(16000000)
-
-HC_OPTS_bspt_Main = HaskellCompilerRunCpp()
-HC_OPTS_bspt_GeomNum = HaskellCompilerRunCpp()
-HC_OPTS_bspt_Input = HaskellCompilerHeapSize(10000000)
-HC_OPTS_bspt_Prog = HaskellCompilerRunCpp()
-
-HC_OPTS_compress_Encode  = HaskellCompilerRunCpp()
-HC_OPTS_compress2 = HaskellCompilerRunCpp()
-
-HC_OPTS_fluid_Main = HaskellCompilerRunCpp()
-
-HC_OPTS_parser_Main = HaskellCompilerHeapSize(20000000)
-
-/*??? NOFIB_RUN_HMMS = -H32m -A1m */
-
-HC_OPTS_veritas_Main = HaskellCompilerRunCpp()
-HC_OPTS_veritas_Parse = HaskellCompilerHeapSize(10000000)
-HC_OPTS_veritas_ThmTactics = HaskellCompilerHeapSize(10000000)
-HC_OPTS_cichelli = HaskellCompilerRunCpp()
-HC_OPTS_knights_Sort = HaskellCompilerRunCpp()
-HC_OPTS_minimax = HaskellCompilerRunCpp()
-
-/* NOFIB_RUN_fft = -H6000000 */
-
-HC_OPTS_comp_lab_zift	= HaskellCompilerRunCpp() HaskellCompilerHeapSize(12000000)
-HC_OPTS_event		= HaskellCompilerRunCpp()
-HC_OPTS_fft		= HaskellCompilerRunCpp()
-HC_OPTS_genfft		= HaskellCompilerRunCpp() HaskellCompilerHeapSize(12000000)
-HC_OPTS_ida		= HaskellCompilerRunCpp()
-HC_OPTS_listcompr	= HaskellCompilerRunCpp()
-HC_OPTS_listcopy	= HaskellCompilerRunCpp()
-HC_OPTS_parstof		= HaskellCompilerRunCpp() HaskellCompilerHeapSize(16000000)
-HC_OPTS_sched		= HaskellCompilerRunCpp()
-HC_OPTS_solid		= HaskellCompilerRunCpp() HaskellCompilerHeapSize(30000000)
-HC_OPTS_transform	= HaskellCompilerRunCpp() HaskellCompilerHeapSize(16000000)
-HC_OPTS_typecheck	= HaskellCompilerRunCpp()
-HC_OPTS_wang		= HaskellCompilerRunCpp()
-HC_OPTS_wave4main	= HaskellCompilerRunCpp() HaskellCompilerHeapSize(16000000)
-
-HC_OPTS_nucleic2	= HaskellCompilerRunCpp() /*-DSTR -DUSE_HARTEL_LAZINESS*/
-
-NOFIB_RUN_comp_lab_zift	= -H24m -A1m
-NOFIB_RUN_event		= -H24m -A1m
-NOFIB_RUN_fft		= -H24m -A1m
-NOFIB_RUN_genfft	= -H24m -A1m
-NOFIB_RUN_ida		= -H24m -A1m
-NOFIB_RUN_listcompr	= -H24m -A1m
-NOFIB_RUN_listcopy	= -H24m -A1m
-NOFIB_RUN_parstof	= -H24m -A1m
-NOFIB_RUN_sched		= -H24m -A1m
-NOFIB_RUN_solid		= -H24m -A1m
-NOFIB_RUN_transform	= -H24m -A1m
-NOFIB_RUN_typecheck	= -H24m -A1m
-NOFIB_RUN_wang		= -H24m -A1m
-NOFIB_RUN_wave4main	= -H24m -A1m
-
-NOFIB_RUN_simple	= -H24m -A1m
-
-/* too much : NOFIB_RUN_treejoin	= -H64m -A2m */
-HC_OPTS_happy = -M -fpbu
diff --git a/mkworld/only4-nofib-nhc.jm b/mkworld/only4-nofib-nhc.jm
deleted file mode 100644
index 775fc4090b7ef91e5868f19aced296f6961b2302..0000000000000000000000000000000000000000
--- a/mkworld/only4-nofib-nhc.jm
+++ /dev/null
@@ -1,56 +0,0 @@
-HC_OPTS_anna = HaskellCompilerHeapSize(16000000)
-
-HC_OPTS_bspt_Main = HaskellCompilerRunCpp()
-HC_OPTS_bspt_GeomNum = HaskellCompilerRunCpp()
-HC_OPTS_bspt_Input = HaskellCompilerHeapSize(10000000)
-HC_OPTS_bspt_Prog = HaskellCompilerRunCpp()
-
-HC_OPTS_compress_Encode = HaskellCompilerRunCpp()
-
-HC_OPTS_fluid_Main = HaskellCompilerRunCpp()
-
-HC_OPTS_parser_Main = HaskellCompilerHeapSize(12000000)
-
-HC_OPTS_veritas_Main = HaskellCompilerRunCpp()
-HC_OPTS_veritas_Parse = HaskellCompilerHeapSize(10000000)
-HC_OPTS_veritas_ThmTactics = HaskellCompilerHeapSize(10000000)
-HC_OPTS_cichelli = HaskellCompilerRunCpp()
-HC_OPTS_knights_Sort = HaskellCompilerRunCpp()
-HC_OPTS_minimax = HaskellCompilerRunCpp()
-
-/* NOFIB_RUN_fft = -H6000000 */
-
-HC_OPTS_comp_lab_zift	= HaskellCompilerRunCpp() HaskellCompilerHeapSize(12000000)
-HC_OPTS_event		= HaskellCompilerRunCpp()
-HC_OPTS_fft		= HaskellCompilerRunCpp()
-HC_OPTS_genfft		= HaskellCompilerRunCpp() HaskellCompilerHeapSize(12000000)
-HC_OPTS_ida		= HaskellCompilerRunCpp()
-HC_OPTS_listcompr	= HaskellCompilerRunCpp()
-HC_OPTS_listcopy	= HaskellCompilerRunCpp()
-HC_OPTS_parstof		= HaskellCompilerRunCpp() HaskellCompilerHeapSize(16000000)
-HC_OPTS_sched		= HaskellCompilerRunCpp()
-HC_OPTS_solid		= HaskellCompilerRunCpp() HaskellCompilerHeapSize(30000000)
-HC_OPTS_transform	= HaskellCompilerRunCpp() HaskellCompilerHeapSize(16000000)
-HC_OPTS_typecheck	= HaskellCompilerRunCpp()
-HC_OPTS_wang		= HaskellCompilerRunCpp()
-HC_OPTS_wave4main	= HaskellCompilerRunCpp() HaskellCompilerHeapSize(16000000)
-
-HC_OPTS_nucleic2	= HaskellCompilerRunCpp() /*-DSTR -DUSE_HARTEL_LAZINESS*/
-/*HC_OPTS_nucleic2_RA	= HaskellCompilerHeapSize(24000000) */
-
-NOFIB_RUN_comp_lab_zift	= -H24m -A1m
-NOFIB_RUN_event		= -H24m -A1m
-NOFIB_RUN_fft		= -H24m -A1m
-NOFIB_RUN_genfft	= -H24m -A1m
-NOFIB_RUN_ida		= -H24m -A1m
-NOFIB_RUN_listcompr	= -H24m -A1m
-NOFIB_RUN_listcopy	= -H24m -A1m
-NOFIB_RUN_parstof	= -H24m -A1m
-NOFIB_RUN_sched		= -H24m -A1m
-NOFIB_RUN_solid		= -H24m -A1m
-NOFIB_RUN_transform	= -H24m -A1m
-NOFIB_RUN_typecheck	= -H24m -A1m
-NOFIB_RUN_wang		= -H24m -A1m
-NOFIB_RUN_wave4main	= -H24m -A1m
-HC_OPTS_dmgob_hmms  	= -ilib
-NOFIB_RUN_dmgob_hmms	= -H32m -A1m
diff --git a/mkworld/only4-nofib.jm b/mkworld/only4-nofib.jm
deleted file mode 100644
index 9293970435d5280c7804b7e184bf77004422b881..0000000000000000000000000000000000000000
--- a/mkworld/only4-nofib.jm
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef ProjectName
-#define ProjectName     NoFib Haskell Benchmark Suite
-#endif
-
-#ifndef ProjectVersion
-#define ProjectVersion  2.01
-#endif
-
-#ifndef ProjectPatchLevel
-#define ProjectPatchLevel patchlevel 0
-#endif
diff --git a/mkworld/site-nofib-ghc.jm b/mkworld/site-nofib-ghc.jm
deleted file mode 100644
index 4679e2abdfcd484c7209e656fb9cd0a9c5d339b2..0000000000000000000000000000000000000000
--- a/mkworld/site-nofib-ghc.jm
+++ /dev/null
@@ -1,56 +0,0 @@
-/* obviously, this setup requires the use of Glasgow Haskell */
-/* "configure-nofib" will so arrange */
-
-/* Haskell compiler options to use always in this `setup';
-   (The per-test and per-module HC options are in
-   only4-nofib-ghc.ljm.)
-*/
-#ifndef SetupHcOpts
-#define SetupHcOpts -recomp -hi-diffs -dcore-lint -link-chk
-#endif
-
-#if alpha_HOST_ARCH
-/* really, any 64-bit machine */
-#define __scale_opt -Rscale-sizes1.5
-#else
-#define __scale_opt /*nothing*/
-#endif
-
-HC_OPTS_std = -O /*-fvia-C -O2-for-C*/ -Rghc-timing __scale_opt
-
-/* flags to give whenever we run a pgm, e.g., "+RTS -H43m -RTS" */
-NOFIB_RUN =
-
-/* ======= ADDING IN EXTRA "WAYS" FOR RUNNING THE SUITE ======== */
-
-#ifndef NoFib_UserWay_a
-#define NoFib_UserWay_a NO
-#endif /* ! NoFib_UserWay_a */
-HC_OPTS_a = -hisuf _a.hi -Rghc-timing __scale_opt -O -prof -auto-all
-NOFIB_RUN_a = +RTS -PT -RTS
-
-#ifndef NoFib_UserWay_b
-#define NoFib_UserWay_b NO/*YES*/
-#endif /* ! NoFib_UserWay_b */
-HC_OPTS_b = -hisuf _b.hi -O2
-NOFIB_RUN_b =
-
-#ifndef NoFib_UserWay_c
-#define NoFib_UserWay_c NO/*YES*/
-#endif /* ! NoFib_UserWay_c */
-HC_OPTS_c = -O -prof -auto -hisuf _c.hi
-NOFIB_RUN_c = +RTS -PT -hC -RTS
-
-#ifndef NoFib_UserWay_d
-#define NoFib_UserWay_d NO/*YES*/
-#endif /* ! NoFib_UserWay_d */
-HC_OPTS_d = -O -threads -hisuf _d.hi
-NOFIB_RUN_d =
-
-#ifndef NoFib_UserWay_e
-#define NoFib_UserWay_e NO/*YES*/
-#endif /* ! NoFib_UserWay_e */
-HC_OPTS_e = -O -unregisterized -debug -darity-checks -hisuf _e.hi
-NOFIB_RUN_e = 
-
-#undef __scale_opt
diff --git a/mkworld/site-nofib-hbc.jm b/mkworld/site-nofib-hbc.jm
deleted file mode 100644
index 84911ae2d5df466e520390505c5eae98e3e350c0..0000000000000000000000000000000000000000
--- a/mkworld/site-nofib-hbc.jm
+++ /dev/null
@@ -1,10 +0,0 @@
-/* obviously, this setup requires the use of Chalmers HBC */
-/* "configure-nofib" will so arrange */
-
-/* Haskell compiler options to use always in this `setup';
-   (The per-test and per-module HC options are in
-   only4-nofib-hbc.ljm.)
-*/
-#ifndef SetupHcOpts
-#define SetupHcOpts -O -fpbu
-#endif
diff --git a/mkworld/site-nofib-nhc.jm b/mkworld/site-nofib-nhc.jm
deleted file mode 100644
index 4a5f27561f3842a4236705d6e3bf3dd0895c29fe..0000000000000000000000000000000000000000
--- a/mkworld/site-nofib-nhc.jm
+++ /dev/null
@@ -1,10 +0,0 @@
-/* obviously, this setup requires the use of Niklas Rojemo's "nhc" */
-/* "configure-nofib" will so arrange */
-
-/* Haskell compiler options to use always in this `setup';
-   (The per-test and per-module HC options are in
-   only4-nofib-nhc.ljm.)
-*/
-#ifndef SetupHcOpts
-#define SetupHcOpts /* none? */
-#endif
diff --git a/mkworld/site-nofib.jm.in b/mkworld/site-nofib.jm.in
deleted file mode 100644
index a4fde87a5ffa63b4d897dc5dd9c373241b7626d0..0000000000000000000000000000000000000000
--- a/mkworld/site-nofib.jm.in
+++ /dev/null
@@ -1,30 +0,0 @@
-/* @configure_input@ */
-
-/* --------------- "standard" Haskell compiler --------------------------- */
-
-#define WithHc @WithHc@
-#define WithHcType @WithHcType@
-
-#define WithNoFibHc @WithNoFibHc@
-#define WithNoFibHcType @WithNoFibHcType@
-
-#if ! (defined(HaskellCompilerCmd) && defined(HaskellCompilerType))
-# if WithNoFibHcType != HC_UNSPECIFIED
-#  define HaskellCompilerCmd  WithNoFibHc
-#  define HaskellCompilerType WithNoFibHcType
-# else
-#  if WithHcType != HC_UNSPECIFIED
-#   define HaskellCompilerCmd  WithHc
-#   define HaskellCompilerType WithHcType
-#  else				  
-#   define HaskellCompilerCmd  haskell-compiler-not-specified
-#   define HaskellCompilerType HC_UNSPECIFIED
-#  endif
-# endif
-#endif
-
-#ifndef MkDependHSCmd
-#define MkDependHSCmd @MkDependHSCmd@
-#endif
-
-#include "buildinfo.jm"
diff --git a/mkworld/suffixes-nofib-ghc.jm b/mkworld/suffixes-nofib-ghc.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/suffixes-nofib-ghc.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/suffixes-nofib-hbc.jm b/mkworld/suffixes-nofib-hbc.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/suffixes-nofib-hbc.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/suffixes-nofib-nhc.jm b/mkworld/suffixes-nofib-nhc.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/suffixes-nofib-nhc.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/suffixes-nofib.jm b/mkworld/suffixes-nofib.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/suffixes-nofib.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/utils-nofib-ghc.jm b/mkworld/utils-nofib-ghc.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/utils-nofib-ghc.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/utils-nofib-hbc.jm b/mkworld/utils-nofib-hbc.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/utils-nofib-hbc.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/utils-nofib-nhc.jm b/mkworld/utils-nofib-nhc.jm
deleted file mode 100644
index e05b0ed81fa0ea81ad0761edc46a4cf6c6103e5d..0000000000000000000000000000000000000000
--- a/mkworld/utils-nofib-nhc.jm
+++ /dev/null
@@ -1 +0,0 @@
-/* yes, empty */
diff --git a/mkworld/utils-nofib.jm b/mkworld/utils-nofib.jm
deleted file mode 100644
index 219c1c309325408b456e5626b2e7a34cf47b1119..0000000000000000000000000000000000000000
--- a/mkworld/utils-nofib.jm
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef FilesToClean
-#define FilesToClean /*none*/
-#endif
-
-#ifndef ExtraFilesToBeVeryClean
-#define ExtraFilesToBeVeryClean /*none*/
-#endif