diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index 93ef97984f9..bf2258a7e4a 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -22,7 +22,7 @@ MPM = <ring> <mpm> <bt> <protocol> <boot> \
       <shield> <vmw3> \
       <thw3> <thw3i3> <ssw3i3> <mpsi> <mpsiw3> <ld> <spi3> \
       <event> <seg> <sac> <poolmrg> <message> <dbgpool> <dbgpooli> \
-      <abq> <meter> <cbs> <poolmv2> <splay> <diag> <version>
+      <abq> <meter> <cbs> <poolmv2> <splay> <diag>
 SW  = <ring> <mpm> <bt> <protocol> <boot> \
       <arenavm> <arenacl> <locus> <arena> <global> <tract> <reserv> \
       <pool> <poolabs> <poolmfs> <poolmv> \
@@ -32,7 +32,7 @@ SW  = <ring> <mpm> <bt> <protocol> <boot> \
       <thw3> <thw3i3> <ssan> <mpsi> <ld> \
       <event> <seg> <sac> <poolmrg> <message> <mpsioan> \
       <poolams> <poolamsi> <dbgpool> <dbgpooli> \
-      <abq> <meter> <cbs> <poolmv2> <splay> <diag> <version> <poolmvff>
+      <abq> <meter> <cbs> <poolmv2> <splay> <diag> <poolmvff>
 PLINTH = <mpsliban> <mpsioan>
 AMC = <poolamc>
 AMS = <poolams> <poolamsi>
@@ -86,64 +86,6 @@ POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\he\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
-!ELSEIF "$(VARIETY)" == "ce"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFCE) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCE)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCE)
-MPMOBJ0 = $(MPM:<=w3i3mv\ce\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ce\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\ce\)
-SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\ce\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\ce\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\ce\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\ce\)
-LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\ce\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\ce\)
-DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ce\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\ce\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ce\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
-
-!ELSEIF "$(VARIETY)" == "hi"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFHI) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHI)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHI)
-MPMOBJ0 = $(MPM:<=w3i3mv\hi\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\hi\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\hi\)
-SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\hi\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\hi\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\hi\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\hi\)
-LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\hi\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\hi\)
-DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hi\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\hi\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hi\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
-
 !ELSEIF "$(VARIETY)" == "di"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
@@ -231,35 +173,6 @@ POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
-!ELSEIF "$(VARIETY)" == "wi"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFWI) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWI)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWI)
-MPMOBJ0 = $(MPM:<=w3i3mv\wi\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\wi\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\wi\)
-SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\wi\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\wi\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\wi\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\wi\)
-LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\wi\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\wi\)
-DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\wi\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\wi\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\wi\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
-
 !ELSEIF "$(VARIETY)" == "we"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE)
diff --git a/mps/code/w3i6mv.nmk b/mps/code/w3i6mv.nmk
index f703ff2cc2c..255600d11ce 100644
--- a/mps/code/w3i6mv.nmk
+++ b/mps/code/w3i6mv.nmk
@@ -88,64 +88,6 @@ POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\he\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
-!ELSEIF "$(VARIETY)" == "ce"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFCE) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCE)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCE)
-MPMOBJ0 = $(MPM:<=w3i6mv\ce\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i6mv\ce\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i6mv\ce\)
-SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i6mv\ce\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i6mv\ce\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i6mv\ce\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i6mv\ce\)
-LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i6mv\ce\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i6mv\ce\)
-DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\ce\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i6mv\ce\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\ce\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
-
-!ELSEIF "$(VARIETY)" == "hi"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFHI) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHI)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHI)
-MPMOBJ0 = $(MPM:<=w3i6mv\hi\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i6mv\hi\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i6mv\hi\)
-SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i6mv\hi\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i6mv\hi\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i6mv\hi\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i6mv\hi\)
-LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i6mv\hi\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i6mv\hi\)
-DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\hi\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i6mv\hi\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\hi\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
-
 !ELSEIF "$(VARIETY)" == "di"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
@@ -233,35 +175,6 @@ POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\ti\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
-!ELSEIF "$(VARIETY)" == "wi"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFWI) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWI)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWI)
-MPMOBJ0 = $(MPM:<=w3i6mv\wi\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i6mv\wi\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i6mv\wi\)
-SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i6mv\wi\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i6mv\wi\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i6mv\wi\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i6mv\wi\)
-LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i6mv\wi\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i6mv\wi\)
-DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\wi\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i6mv\wi\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\wi\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
-
 !ELSEIF "$(VARIETY)" == "we"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE)