diff --git a/src/MAKE/MORE/Makefile.altix b/src/MAKE/MORE/Makefile.altix
deleted file mode 100644
index 3dbccb4ab..000000000
--- a/src/MAKE/MORE/Makefile.altix
+++ /dev/null
@@ -1,108 +0,0 @@
-# altix = SGI Altix, Intel icc, MPI, FFTs from SGI SCSL library
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		icc
-CCFLAGS =	-O2
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		icc
-LINKFLAGS =	-O2
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX
-MPI_PATH = 
-MPI_LIB =	-lmpi
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_SCSL
-FFT_PATH = 
-FFT_LIB =
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.auto b/src/MAKE/MORE/Makefile.auto
deleted file mode 100644
index 07b7ec139..000000000
--- a/src/MAKE/MORE/Makefile.auto
+++ /dev/null
@@ -1,109 +0,0 @@
-# linux = RedHat Linux box, Intel icc, MPICH2, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		icc
-CCFLAGS =	-O -fopenmp -DLAMMPS_MEMALIGN=64 -restrict -xHost -DLMP_INTEL_OFFLOAD -fno-alias -ansi-alias -override-limits -offload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		icc
-LINKFLAGS =	-O -fopenmp -offload
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-OMP =		yes
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX
-MPI_PATH = 
-MPI_LIB =	-lmpich -lmpl -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.beacon b/src/MAKE/MORE/Makefile.beacon
deleted file mode 100755
index 98e816a43..000000000
--- a/src/MAKE/MORE/Makefile.beacon
+++ /dev/null
@@ -1,109 +0,0 @@
-# linux = RedHat Linux box, Intel icc, MPICH2, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpiicpc -openmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64
-MIC_OPT =       -offload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""
-CCFLAGS =	-O3 -xAVX -fno-alias -ansi-alias -restrict -override-limits $(MIC_OPT)
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpiicpc -openmp
-LINKFLAGS =	-O3 -xAVX
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =  
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =      -DFFT_MKL -DFFT_SINGLE -I$(MKLROOT)
-FFT_PATH = 
-FFT_LIB =	-L$(MKLROOT) -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.bgl b/src/MAKE/MORE/Makefile.bgl
deleted file mode 100644
index a0a227dfd..000000000
--- a/src/MAKE/MORE/Makefile.bgl
+++ /dev/null
@@ -1,114 +0,0 @@
-# bgl = LLNL Blue Gene Light machine, xlC, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .u 
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		/opt/ibmcmp/vacpp/7.0/bin/blrts_xlC
-CCFLAGS =	-O3
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		/opt/ibmcmp/vacpp/7.0/bin/blrts_xlC
-LINKFLAGS =	-O \
-                -L/opt/ibmcmp/xlf/9.1/blrts_lib \
-                -L/opt/ibmcmp/vacpp/7.0/blrts_lib \
-                -L/bgl/local/lib \
-                -L/bgl/local/bglfftwgel-2.1.5.pre5/lib
-LIB =           -lxlopt -lxlomp_ser -lxl -lxlfmath -lm \
-                -lmsglayer.rts -lrts.rts -ldevices.rts -lmassv
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX
-MPI_PATH = 
-MPI_LIB =	-lmpich.rts 
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.bgq b/src/MAKE/MORE/Makefile.bgq
deleted file mode 100644
index 6558e9978..000000000
--- a/src/MAKE/MORE/Makefile.bgq
+++ /dev/null
@@ -1,55 +0,0 @@
-# bgq = IBM Blue Gene/Q, multiple compiler options, native MPI, ALCF FFTW2
-
-SHELL = /bin/bash
-.SUFFIXES: .cpp .u 
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-# select which compiler by editing Makefile.bgq.details
-
-include ../MAKE/Makefile.bgq.details
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib: $(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib: $(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-ifneq ($(COMPILER),XLC)
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-endif
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
-
-
diff --git a/src/MAKE/MORE/Makefile.bgq.details b/src/MAKE/MORE/Makefile.bgq.details
deleted file mode 100644
index eebf77515..000000000
--- a/src/MAKE/MORE/Makefile.bgq.details
+++ /dev/null
@@ -1,104 +0,0 @@
-# multiple compiler options for BGQ
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-# uncomment one and only one of the following three lines 
-# to choose a compiler toolchain
-
-#COMPILER = GCC
-#COMPILER = LLVM
-COMPILER = XLC
-
-ifeq ($(COMPILER),XLC)
-CC       = /bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpixlcxx_r
-CCFLAGS  = -O3 -qarch=qp -qtune=qp -qsmp=omp -qsimd=auto -qhot=level=2 -qprefetch -qunroll=yes
-FC       = /bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpixlf90_r
-FFLAGS   = -O3 -qarch=qp -qtune=qp -qsimd=auto -qhot=level=2 -qprefetch -qunroll=yes -qsmp=omp -qextname -qnosave
-DEPFLAGS = -M -qmakedep=gcc
-endif
-
-ifeq ($(COMPILER),GCC)
-CC       = /bgsys/drivers/ppcfloor/comm/gcc.legacy/bin/mpicxx
-CCFLAGS  = -O3 -fopenmp
-FC       = /bgsys/drivers/ppcfloor/comm/gcc.legacy/bin/mpif90
-FFLAGS   = -O3 -fopenmp
-DEPFLAGS = -M
-endif
-
-ifeq ($(COMPILER),LLVM)
-#CC       = bgclang++
-CC       = /home/projects/llvm/mpi/bgclang/bin/mpiclang++
-CCFLAGS  = -O3 -fopenmp
-DEPFLAGS = -M
-FC	 = /bin/false
-FFLAGS   = LLVM does not have a Fortran front-end!
-endif
-
-LINK      = $(CC)
-LINKFLAGS = $(CCFLAGS)
-
-ifeq ($(COMPILER),XLC)
-  MASS_LIB    = ${IBM_MAIN_DIR}/xlmass/bg/7.3/bglib64 
-  XLF_LIB     = ${IBM_MAIN_DIR}/xlf/bg/14.1/bglib64
-  XLSMP_LIB   = ${IBM_MAIN_DIR}/xlsmp/bg/3.1/bglib64
-  LIB        += -L${MASS_LIB} -L${XLF_LIB} -L${XLSMP_LIB} 
-  LIB        += -lmassv -lmass 
-  LIB        += -lxlf90_r -lxlsmp -lxlopt -lxlfmath -lxl
-endif
-
-ifeq ($(COMPILER),GCC)
-# libm is definitely slower than libmass...
-  LIB += -lm -lgfortran
-endif
-
-ifeq ($(COMPILER),LLVM)
-    SLEEF_DIR = /home/projects/llvm/sleef
-    LIB += -L${SLEEF_DIR}/lib -lsleef
-endif
-
-SIZE       = size
-
-ARCHIVE    = ar
-ARFLAGS    = -rc
-
-# BGQ should not use shared libraries
-SHFLAGS    =
-SHLIBFLAGS = 
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC = -DLAMMPS_GZIP
-
-# MPI library
-# see discussion in doc/Section_start.html#2_2 (step 5)
-
-MPI_PATH   = 
-MPI_PATH   = 
-MPI_LIB    =
-
-MPI_INC += -DMPICH_SKIP_MPICXX 
-MPI_LIB += #/home/jhammond/OSPRI/branches/marpn/wrap/libmpiarbrpn.a
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-
-FFT_INC  = -I/soft/libraries/alcf/current/xl/FFTW2/include -DFFT_FFTW -DFFTW_SIZE
-FFT_PATH = #/soft/libraries/alcf/current/xl/FFTW2
-FFT_LIB  = -L/soft/libraries/alcf/current/xl/FFTW2/lib -ldfftw
-
-# JPEG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG listed with LMP_INC
-
-JPG_INC  =       
-JPG_PATH = 
-JPG_LIB  =
-
diff --git a/src/MAKE/MORE/Makefile.chama b/src/MAKE/MORE/Makefile.chama
deleted file mode 100644
index 513528868..000000000
--- a/src/MAKE/MORE/Makefile.chama
+++ /dev/null
@@ -1,104 +0,0 @@
-# chama - Intel sandybridge with dual socket/eight core nodes, mpic++, openmpi, no FFTW
-
-# need to load the following modules:
-# 1) intel/12.1
-# 2) openmpi-intel/1.4
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =            mpic++
-CCFLAGS =       -O3 -axAVX -funroll-loops -fstrict-aliasing -openmp
-DEPFLAGS =      -M
-LINK =          mpic++
-LINKFLAGS =     -O3 -axAVX -openmp
-LIB =           -lstdc++
-ARCHIVE =       ar
-ARFLAGS =       -rcsv
-SIZE =          size
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =       -DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       
-MPI_PATH = 
-MPI_LIB =
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-#FFT_INC =    -DFFT_FFTW -I${FFTW_INCLUDE}
-#FFT_PATH =   -L${FFTW_LIB}
-#FFT_LIB =    -lfftw 
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include Makefile.package.settings
-include Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE): $(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library target
-
-lib:    $(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.cuda b/src/MAKE/MORE/Makefile.cuda
deleted file mode 100755
index 61b1738ba..000000000
--- a/src/MAKE/MORE/Makefile.cuda
+++ /dev/null
@@ -1,111 +0,0 @@
-# cuda = RedHat Linux box, nvcc for Kokkos, MPICH2, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		nvcc
-CCFLAGS =	-g -O3 -arch=sm_20
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		g++
-LINKFLAGS =	-g -O
-LIB = 
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX
-MPI_PATH = 
-MPI_LIB =	-lmpich -lmpl -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =    	-DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cu
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.cygwin b/src/MAKE/MORE/Makefile.cygwin
deleted file mode 100644
index 0677cdf4b..000000000
--- a/src/MAKE/MORE/Makefile.cygwin
+++ /dev/null
@@ -1,108 +0,0 @@
-# cygwin = Windows Cygwin, mpicxx, MPICH, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpicxx
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpicxx
-LINKFLAGS =	-O
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH =	-L/cygdrive/c/cygwin/mpich2-1.0.4p1/lib
-MPI_LIB =	-lmpich
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I/cygdrive/c/cygwin/usr/local/include
-FFT_PATH =	-L/cygdrive/c/cygwin/usr/local/lib 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.debug b/src/MAKE/MORE/Makefile.debug
deleted file mode 100644
index f3622ed59..000000000
--- a/src/MAKE/MORE/Makefile.debug
+++ /dev/null
@@ -1,108 +0,0 @@
-# serial_debug = RedHat Linux box, g++4, no MPI, no FFTs
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		g++4
-CCFLAGS =	-O -Wall -W -O2 -funroll-loops -fstrict-aliasing
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		g++4
-LINKFLAGS =	-O
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rcsv
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi_stubs
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_NONE
-FFT_PATH = 
-FFT_LIB =
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.encanto b/src/MAKE/MORE/Makefile.encanto
deleted file mode 100644
index 9d0e92b87..000000000
--- a/src/MAKE/MORE/Makefile.encanto
+++ /dev/null
@@ -1,108 +0,0 @@
-# encanto = NM cluster with dual quad-core Xeons, mpicxx, native MPI, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpicxx
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpicxx
-LINKFLAGS =	-O
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-lmpich -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I/home/jlane/fftw-2.1.5/fftw
-FFT_PATH =	-L/home/jlane/fftw-2.1.5/fftw/.libs
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.fink b/src/MAKE/MORE/Makefile.fink
deleted file mode 100644
index ef36186e6..000000000
--- a/src/MAKE/MORE/Makefile.fink
+++ /dev/null
@@ -1,108 +0,0 @@
-# fink = Mac OS-X w/ fink libraries, c++, no MPI, FFTW 2.1.5
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		c++
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		c++
-LINKFLAGS =	-O
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi_stubs
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I/sw/include 
-FFT_PATH =	-L/sw/lib
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.g++ b/src/MAKE/MORE/Makefile.g++
deleted file mode 100755
index b51db07fa..000000000
--- a/src/MAKE/MORE/Makefile.g++
+++ /dev/null
@@ -1,108 +0,0 @@
-# g++ = RedHat Linux box, g++4, MPICH2, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		g++
-CCFLAGS =	-g -O # -Wunused
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		g++
-LINKFLAGS =	-g -O
-LIB = 
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX
-MPI_PATH = 
-MPI_LIB =	-lmpich -lmpl -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =    	-DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.g++3 b/src/MAKE/MORE/Makefile.g++3
deleted file mode 100755
index 51c8d54bd..000000000
--- a/src/MAKE/MORE/Makefile.g++3
+++ /dev/null
@@ -1,108 +0,0 @@
-# g++3 = RedHat Linux box, g++ (v3), MPICH2, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		g++
-CCFLAGS =	-g -O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		g++
-LINKFLAGS =	-g -O
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-lmpich -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.g++_openmpi b/src/MAKE/MORE/Makefile.g++_openmpi
deleted file mode 100755
index c8912f171..000000000
--- a/src/MAKE/MORE/Makefile.g++_openmpi
+++ /dev/null
@@ -1,108 +0,0 @@
-# g++ = RedHat Linux box, g++4, OpenMPI, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		g++
-CCFLAGS =	-g -O # -Wunused
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		g++
-LINKFLAGS =	-g -O
-LIB = 
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX -I/usr/local/openmpi/include
-MPI_PATH =      -L/usr/local/openmpi/lib
-MPI_LIB =	-lmpi -lmpi_cxx
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =    	-DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.glory b/src/MAKE/MORE/Makefile.glory
deleted file mode 100644
index 3a6f5872c..000000000
--- a/src/MAKE/MORE/Makefile.glory
+++ /dev/null
@@ -1,125 +0,0 @@
-# glory = Linux cluster with 4-way quad cores, Intel mpicxx, native MPI, FFTW
-
-SHELL = /bin/sh
-
-# this Makefile builds LAMMPS for mvapich running on Glory
-# to invoke this Makefile, you need these modules loaded:
-#   compilers/intel-11.1-f064-c064
-#   mpi/mvapich-1.1_intel-11.1-f064-c064
-#   libraries/fftw-2.1.5
-# you can determine which modules are loaded by typing:
-#   module list
-# these modules are not the default ones, but can be enabled by 
-#   lines like this in your .cshrc or other start-up shell file
-#   or by typing them before you build LAMMPS:
-#     module swap mpi misc/env-mvapich
-#     module load compilers/intel-11.1-f064-c064
-#     module load mpi/mvapich-1.1_intel-11.1-f064-c064
-#     module load libraries/fftw-2.1.5
-# these same modules need to be loaded to submit a LAMMPS job,
-#   either interactively or via a batch script
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpicxx
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpicxx
-LINKFLAGS =	-O
-LIB =           -lstdc++ -lm
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       
-MPI_PATH = 
-MPI_LIB =	
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I${FFTW_INCLUDE}
-FFT_PATH =	-L${FFTW_LIB}
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.intel b/src/MAKE/MORE/Makefile.intel
deleted file mode 100755
index 2b209e27b..000000000
--- a/src/MAKE/MORE/Makefile.intel
+++ /dev/null
@@ -1,108 +0,0 @@
-# Intel compiler, Intel MPI, MKL FFT, no offload to coprocessor
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpiicpc -openmp -DLAMMPS_MEMALIGN=64 -no-offload
-CCFLAGS =	-O3 -xHost -fno-alias -ansi-alias -restrict -override-limits
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpiicpc -openmp
-LINKFLAGS =	-O3 -xHost
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =      -DFFT_MKL -DFFT_SINGLE
-FFT_PATH = 
-FFT_LIB = -L$MKLROOT/lib/intel64/ -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core	
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.intel_offload b/src/MAKE/MORE/Makefile.intel_offload
deleted file mode 100755
index eb4415fc8..000000000
--- a/src/MAKE/MORE/Makefile.intel_offload
+++ /dev/null
@@ -1,109 +0,0 @@
-# Intel compiler, Intel MPI, MKL FFT, no offload to coprocessor
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpiicpc -openmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64
-MIC_OPT =       -offload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""
-CCFLAGS =	-g -O3 -xHost -fno-alias -ansi-alias -restrict -override-limits $(MIC_OPT)
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpiicpc -openmp -offload
-LINKFLAGS =	-O3 -xHost
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =      -DFFT_MKL -DFFT_SINGLE
-FFT_PATH = 
-FFT_LIB =	-L$(MKLROOT)/lib/intel64/ -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.jaguar b/src/MAKE/MORE/Makefile.jaguar
deleted file mode 100644
index c6282d3cf..000000000
--- a/src/MAKE/MORE/Makefile.jaguar
+++ /dev/null
@@ -1,108 +0,0 @@
-# jaguar = ORNL Jaguar Cray XT5, CC, native MPICH, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CXX =           CC
-CCFLAGS =	-g -O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		$(CXX)
-LINKFLAGS =	-g -O
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DNODE_PARTITION
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-lmpich -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW3 -I$(FFTW_INC)
-FFT_PATH =	 -L$(FFTW_DIR)
-FFT_LIB =	-lfftw3
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.lam b/src/MAKE/MORE/Makefile.lam
deleted file mode 100644
index 66b5537da..000000000
--- a/src/MAKE/MORE/Makefile.lam
+++ /dev/null
@@ -1,108 +0,0 @@
-# lam = FreeBSD box, mpic++, LAM/MPI, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpic++
-CCFLAGS =	-O3
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpic++
-LINKFLAGS =	-O3
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       
-MPI_PATH = 
-MPI_LIB =	-lmpi
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.linux b/src/MAKE/MORE/Makefile.linux
deleted file mode 100755
index 524cd6c08..000000000
--- a/src/MAKE/MORE/Makefile.linux
+++ /dev/null
@@ -1,108 +0,0 @@
-# linux = RedHat Linux box, Intel icc, MPICH2, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		icc
-CCFLAGS =	-O3
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		icc
-LINKFLAGS =	-O
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-lmpich -lmpl -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.mac b/src/MAKE/MORE/Makefile.mac
deleted file mode 100755
index 52def3fbe..000000000
--- a/src/MAKE/MORE/Makefile.mac
+++ /dev/null
@@ -1,108 +0,0 @@
-# mac = Apple PowerBook G4 laptop, c++, no MPI, FFTW 2.1.5
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		c++
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		c++
-LINKFLAGS =	-O
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi_stubs
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.mac_mpi b/src/MAKE/MORE/Makefile.mac_mpi
deleted file mode 100755
index 61f025564..000000000
--- a/src/MAKE/MORE/Makefile.mac_mpi
+++ /dev/null
@@ -1,113 +0,0 @@
-# mac_mpi = Apple laptop, MacPorts Open MPI 1.4.3, gcc 4.8, fftw, jpeg
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# generally no need to edit this section
-# unless additional compiler/linker flags or libraries needed for your machine
-
-CC =	 	/opt/local/bin/mpicxx-openmpi-mp
-CCFLAGS =	-O3 
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		/opt/local/bin/mpicxx-openmpi-mp
-LINKFLAGS =	-O3
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DOMPI_SKIP_MPICXX
-MPI_PATH =	
-MPI_LIB =	
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFTW =	/usr/local
-
-FFT_INC =       -DFFT_FFTW -I${FFTW}/include
-FFT_PATH =	-L${FFTW}/lib
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       -I/opt/local/include
-JPG_PATH = 	-L/opt/local/lib
-JPG_LIB =	-ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.mingw32-cross b/src/MAKE/MORE/Makefile.mingw32-cross
deleted file mode 100644
index 1d3305d8a..000000000
--- a/src/MAKE/MORE/Makefile.mingw32-cross
+++ /dev/null
@@ -1,117 +0,0 @@
-# mingw32-cross = Windows 32-bit, cross-compiled on Fedora 18, gcc-4.7.1, MinGW, internal FFT, no MPI, OpenMP
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		i686-w64-mingw32-g++
-CCFLAGS =	-O3 -march=i686 -mtune=generic -mfpmath=387 -mpc64 -fopenmp	\
-		-ffast-math -fstrict-aliasing -Wall -W -Wno-uninitialized
-
-SHFLAGS =	# -fPIC (not needed on windows, all code is PIC)
-DEPFLAGS =	-M
-
-LINK =		i686-w64-mingw32-g++
-LINKFLAGS =	-O2 -march=i686 -mtune=generic -mfpmath=387 -mpc64 -fopenmp
-LIB =           -lwsock32 -static-libgcc
-SIZE =		i686-w64-mingw32-size
-
-ARCHIVE =	i686-w64-mingw32-ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# name of object file subdir for libraries in lib with leading '/'
-LIBOBJDIR = 	/Obj_mingw32
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_SMALLSMALL -DLAMMPS_JPEG -DLAMMPS_PNG -DLAMMPS_XDR -DLAMMPS_GZIP -DLAMMPS_FFMPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I../STUBS
-MPI_PATH =      -L../STUBS
-MPI_LIB =	-lmpi_mingw32
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH = 
-FFT_LIB =
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg -lpng -lz
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
-
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/src/MAKE/MORE/Makefile.mingw32-cross-mpi b/src/MAKE/MORE/Makefile.mingw32-cross-mpi
deleted file mode 100644
index 82694c0e4..000000000
--- a/src/MAKE/MORE/Makefile.mingw32-cross-mpi
+++ /dev/null
@@ -1,117 +0,0 @@
-# mingw32-cross-mpi = Windows 32-bit, cross-compiled on Fedora 18, gcc-4.7.1, MinGW, internal FFT, MPICH2, OpenMP
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		i686-w64-mingw32-g++
-CCFLAGS =	-O3 -march=i686 -mtune=generic -mfpmath=387 -mpc64 -fopenmp	\
-		-ffast-math -fstrict-aliasing -Wall -W -Wno-uninitialized
-
-SHFLAGS =	# -fPIC (not needed on windows, all code is PIC)
-DEPFLAGS =	-M
-
-LINK =		i686-w64-mingw32-g++
-LINKFLAGS =	-O2 -march=i686 -mtune=generic -mfpmath=387 -mpc64 -fopenmp
-LIB =           -lwsock32 -static-libgcc
-SIZE =		i686-w64-mingw32-size
-
-ARCHIVE =	i686-w64-mingw32-ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# name of object file subdir for libraries in lib with leading '/'
-LIBOBJDIR = 	/Obj_mingw32-mpi
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_SMALLSMALL -DLAMMPS_JPEG -DLAMMPS_PNG -DLAMMPS_XDR -DLAMMPS_GZIP -DLAMMPS_FFMPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I../../tools/mingw-cross/mpich2-win32/include
-MPI_PATH =      -L../../tools/mingw-cross/mpich2-win32/lib
-MPI_LIB =	-lmpi
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH = 
-FFT_LIB =
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg -lpng -lz
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
-
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/src/MAKE/MORE/Makefile.mingw64-cross b/src/MAKE/MORE/Makefile.mingw64-cross
deleted file mode 100644
index 143566764..000000000
--- a/src/MAKE/MORE/Makefile.mingw64-cross
+++ /dev/null
@@ -1,117 +0,0 @@
-# mingw64-cross = Windows 64-bit, cross-compiled on Fedora 18, gcc-4.7.1, MinGW, internal FFT, no MPI, OpenMP
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		x86_64-w64-mingw32-g++
-CCFLAGS =	-O3 -march=core2 -mtune=core2 -mpc64 -msse2 -fopenmp	\
-		-ffast-math -fstrict-aliasing -Wall -W -Wno-uninitialized
-
-SHFLAGS =	# -fPIC (not needed on windows, all code is PIC)
-DEPFLAGS =	-M
-
-LINK =		x86_64-w64-mingw32-g++
-LINKFLAGS =	-O2 -march=core2 -mtune=core2 -mpc64 -msse2 -fopenmp
-LIB =           -lwsock32 -static-libgcc
-SIZE =		x86_64-w64-mingw32-size
-
-ARCHIVE =	x86_64-w64-mingw32-ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# name of object file subdir for libraries in lib with leading '/'
-LIBOBJDIR = 	/Obj_mingw64
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_SMALLBIG -DLAMMPS_JPEG -DLAMMPS_PNG -DLAMMPS_XDR -DLAMMPS_GZIP -DLAMMPS_FFMPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I../STUBS
-MPI_PATH =      -L../STUBS
-MPI_LIB =	-lmpi_mingw64
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH = 
-FFT_LIB =
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg -lpng -lz
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
-
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/src/MAKE/MORE/Makefile.mingw64-cross-mpi b/src/MAKE/MORE/Makefile.mingw64-cross-mpi
deleted file mode 100644
index ce110ddc3..000000000
--- a/src/MAKE/MORE/Makefile.mingw64-cross-mpi
+++ /dev/null
@@ -1,117 +0,0 @@
-# mingw64-cross-mpi = Windows 64-bit, cross-compiled on Fedora 18, gcc-4.7.1, MinGW, internal FFT, MPICH2, OpenMP
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		x86_64-w64-mingw32-g++
-CCFLAGS =	-O3 -march=core2 -mtune=core2 -mpc64 -msse2 -fopenmp	\
-		-ffast-math -fstrict-aliasing -Wall -W -Wno-uninitialized
-
-SHFLAGS =	# -fPIC (not needed on windows, all code is PIC)
-DEPFLAGS =	-M
-
-LINK =		x86_64-w64-mingw32-g++
-LINKFLAGS =	-O2 -march=core2 -mtune=core2 -mpc64 -msse2 -fopenmp
-LIB =           -lwsock32 -static-libgcc
-SIZE =		x86_64-w64-mingw32-size
-
-ARCHIVE =	x86_64-w64-mingw32-ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# name of object file subdir for libraries in lib with leading '/'
-LIBOBJDIR = 	/Obj_mingw64-mpi
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_SMALLBIG -DLAMMPS_JPEG -DLAMMPS_PNG -DLAMMPS_XDR -DLAMMPS_GZIP -DLAMMPS_FFMPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I../../tools/mingw-cross/mpich2-win64/include
-MPI_PATH =      -L../../tools/mingw-cross/mpich2-win64/lib
-MPI_LIB =	-lmpi
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH = 
-FFT_LIB =
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg -lpng -lz
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
-
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/src/MAKE/MORE/Makefile.mkl b/src/MAKE/MORE/Makefile.mkl
deleted file mode 100644
index b0f7ad215..000000000
--- a/src/MAKE/MORE/Makefile.mkl
+++ /dev/null
@@ -1,114 +0,0 @@
-# mkl = Intel Cluster Tools, mpiicc, MKL MPI, MKL FFT
-
-# Intel recommends Intel Cluster Tools Compiler Edition
-# to build libfftw2xc_intel.a: 
-# > cd /opt/intel/mkl/10.0.011/interfaces/fftw2xc
-# > become root via su
-# > gmake libem64t
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpiicc
-CCFLAGS =	-O3 -fno-alias -ip -unroll0
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpiicc
-LINKFLAGS =	-O -L/opt/intel/mkl/10.0.011/lib/em64t 
-LIB =           -lstdc++ -lpthread -lmkl_em64t -lguide 
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-mt_mpi
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I/opt/intel/mkl/10.0.011/include/fftw 
-FFT_PATH = 
-FFT_LIB =	/opt/intel/mkl/10.0.011/lib/em64t/libfftw2xc_intel.a
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.odin b/src/MAKE/MORE/Makefile.odin
deleted file mode 100755
index 11fbd6490..000000000
--- a/src/MAKE/MORE/Makefile.odin
+++ /dev/null
@@ -1,108 +0,0 @@
-# odin = 1400 cluster, g++, MPICH, no FFTs
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		g++
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		G++
-LINKFLAGS =	-O
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I/opt/mpich-mx/include
-MPI_PATH =	-L/opt/mpich-mx/lib -L/opt/mx/lib
-MPI_LIB =	-lmpich -lmyriexpress
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_NONE
-FFT_PATH = 
-FFT_LIB =	
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.openmpi b/src/MAKE/MORE/Makefile.openmpi
deleted file mode 100644
index a69a50846..000000000
--- a/src/MAKE/MORE/Makefile.openmpi
+++ /dev/null
@@ -1,109 +0,0 @@
-# openmpi = Fedora Core 6, mpic++, OpenMPI-1.1, FFTW2
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpic++
-CCFLAGS =	-O2 \
-		-funroll-loops -fstrict-aliasing -Wall -W -Wno-uninitialized
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpic++
-LINKFLAGS =	-O
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rcsv
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       
-MPI_PATH = 
-MPI_LIB =	
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.pgi b/src/MAKE/MORE/Makefile.pgi
deleted file mode 100644
index 879cd428a..000000000
--- a/src/MAKE/MORE/Makefile.pgi
+++ /dev/null
@@ -1,109 +0,0 @@
-# pgi = Portland Group compiler, pgCC, MPICH, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		pgCC
-CCFLAGS =	-fast
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		pgCC
-LINKFLAGS =	
-LIB =           
-#LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I/usr/local/mpich-1.2.6/pg/include
-MPI_PATH =	-L/usr/local/mpich-1.2.6/pg/lib
-MPI_LIB =	-lmpich
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.power5 b/src/MAKE/MORE/Makefile.power5
deleted file mode 100644
index 353c49b62..000000000
--- a/src/MAKE/MORE/Makefile.power5
+++ /dev/null
@@ -1,109 +0,0 @@
-# power5 = IBM Power5+, mpCC_r, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .u
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpCC_r
-CCFLAGS =	-O3 -qnoipa -qlanglvl=oldmath
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpCC_r
-LINKFLAGS =	-O -qnoipa -qlanglvl=oldmath -bmaxdata:0x70000000
-LIB =           -lm
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       
-MPI_PATH = 
-MPI_LIB =	
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I/scr/oppe/LAMMPS/fftw-2.1.5/include
-FFT_PATH =	-L/scr/oppe/LAMMPS/fftw-2.1.5/lib
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.qed b/src/MAKE/MORE/Makefile.qed
deleted file mode 100644
index d13d15d87..000000000
--- a/src/MAKE/MORE/Makefile.qed
+++ /dev/null
@@ -1,108 +0,0 @@
-# qed = CSRI cluster, mpiCC, MPICH, no FFTs
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpiCC
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpiCC
-LINKFLAGS =	-O
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I/usr/local/mpich-1.2.6-eth/include
-MPI_PATH =	-L/usr/local/mpich-1.2.6-eth/lib 
-MPI_LIB =	-lmpich
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_NONE
-FFT_PATH = 
-FFT_LIB =	
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.redsky b/src/MAKE/MORE/Makefile.redsky
deleted file mode 100644
index 3c2fd0d31..000000000
--- a/src/MAKE/MORE/Makefile.redsky
+++ /dev/null
@@ -1,128 +0,0 @@
-# redsky - SUN X6275 nodes, dual socket/quad core 2.93 GHz Nehalem processors, mpic++, openmpi, OpenMP, no FFTW 
-
-SHELL = /bin/sh
-
-# This Makefile builds LAMMPS for RedSky with OpenMPI.
-# To use this Makefile, you need appropriate modules loaded.
-# You can determine which modules are loaded by typing:
-#   module list
-# These modules can be enabled by lines like this in your .cshrc or 
-# other start-up shell file or by typing them before you build LAMMPS:
-#   module load mpi/openmpi-1.4.2_oobpr_intel-11.1-f064-c064
-#   module load libraries/intel-mkl-11.1.064
-#   module load libraries/fftw-2.1.5_openmpi-1.4.2_oobpr_intel-11.1-f064-c064
-# These same modules need to be loaded to submit a LAMMPS job,
-#   either interactively or via a batch script.
-
-# IMPORTANT NOTE:
-# to run efficiently on RedSky, use the "numa_wrapper" mpiexec option,
-#   to insure proceses and their memory are locked to specific cores
-# e.g. in your batch script:
-#   nodes=$SLURM_JOB_NUM_NODES
-#   cores=8
-#   mpiexec --npernode $cores numa_wrapper --ppn $cores lmp_redsky < in > out
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpic++ -fopenmp
-CCFLAGS =	-O2 -xsse4.2 -funroll-loops -fstrict-aliasing
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpic++ -fopenmp
-LINKFLAGS =	-O -xsse4.2 
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rcsv
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       
-MPI_PATH = 
-MPI_LIB =	
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-#FFT_INC =    -DFFT_FFTW -I${FFTW_INCLUDE}
-#FFT_PATH =   -L${FFTW_LIB}
-#FFT_LIB =    -lfftw 
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.sdsc b/src/MAKE/MORE/Makefile.sdsc
deleted file mode 100644
index 4257fea35..000000000
--- a/src/MAKE/MORE/Makefile.sdsc
+++ /dev/null
@@ -1,113 +0,0 @@
-# sdsc = SDSC BG/L machine, xlC, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .u 
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		blrts_xlC
-CCFLAGS =	-I/bgl/BlueLight/ppcfloor/bglsys/include \
-		-O2 -qarch=440 -qtune=440
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M -qmakedep=gcc
-
-LINK =		blrts_xlC
-LINKFLAGS =	-O \
-		-L/bgl/BlueLight/ppcfloor/bglsys/lib \
-		-L/opt/ibmcmp/xlf/bg/10.1/blrts_lib \
-		-L/opt/ibmcmp/vacpp/bg/8.0/blrts_lib
-LIB =           -lm
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_XDR
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-lmpich.rts -lmsglayer.rts -lrts.rts -ldevices.rts 
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I//usr/local/apps/V1R3/fftw-2.1.5d/include
-FFT_PATH =	-L/usr/local/apps/V1R3/fftw-2.1.5d/lib
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.seaborg b/src/MAKE/MORE/Makefile.seaborg
deleted file mode 100644
index 5065136d0..000000000
--- a/src/MAKE/MORE/Makefile.seaborg
+++ /dev/null
@@ -1,109 +0,0 @@
-# seaborg = NERSC IBM machine, mpCC, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .u
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpCC_r
-CCFLAGS =	-O2 -qnoipa
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpCC_r
-LINKFLAGS =	-O -L/usr/lib
-LIB =           -lm
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-lmpich -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I/usr/common/usg/fftw/2.1.5/include
-FFT_PATH =	-L/usr/common/usg/fftw/2.1.5/lib
-FFT_LIB =	-lfftw -lfftw_mpi
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.serial b/src/MAKE/MORE/Makefile.serial
deleted file mode 100755
index 9c2935584..000000000
--- a/src/MAKE/MORE/Makefile.serial
+++ /dev/null
@@ -1,108 +0,0 @@
-# serial = RedHat Linux box, g++4, no MPI, no FFTs
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		g++
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		g++
-LINKFLAGS =	-O
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I../STUBS
-MPI_PATH =      -L../STUBS
-MPI_LIB =	-lmpi_stubs
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH = 
-FFT_LIB =
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.sgi b/src/MAKE/MORE/Makefile.sgi
deleted file mode 100644
index bc09561b9..000000000
--- a/src/MAKE/MORE/Makefile.sgi
+++ /dev/null
@@ -1,108 +0,0 @@
-# sgi = SGI Origin 350 64-bit, SGI MIPSpro CC, SGI MPI, SGI SCSL MP FFTs
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		CC
-CCFLAGS =	-64 -O -mp
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		CC
-LINKFLAGS =	-O
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       
-MPI_PATH = 
-MPI_LIB =	
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_SCSL
-FFT_PATH = 
-FFT_LIB =	
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.solaris b/src/MAKE/MORE/Makefile.solaris
deleted file mode 100644
index e458d12fd..000000000
--- a/src/MAKE/MORE/Makefile.solaris
+++ /dev/null
@@ -1,108 +0,0 @@
-# solaris = Sun box, c++, no MPI, no FFTs
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		c++
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		c++
-LINKFLAGS =	-O
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi_stubs
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_NONE
-FFT_PATH = 
-FFT_LIB =	
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.spirit b/src/MAKE/MORE/Makefile.spirit
deleted file mode 100644
index e3dd404c8..000000000
--- a/src/MAKE/MORE/Makefile.spirit
+++ /dev/null
@@ -1,116 +0,0 @@
-# spirit = HP cluster 64-bit, mpicxx, native MPI, FFTW
-
-SHELL = /bin/sh
-
-# users may wish to add the following lines to their .bashrc or equivalent: 
-# if [ "$SNLCLUSTER" = "spirit" ]; then
-#   source /opt/modules/default/init/bash
-#   module load libraries/fftw-2.1.5_openmpi-1.2.2_mx_intel-9.1-f040-c045
-# fi;
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpicxx
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpicxx
-LINKFLAGS =	-O
-LIB =           -lm
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       
-MPI_PATH = 
-MPI_LIB =	
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFTW =		/apps/x86_64/libraries/fftw/openmpi-1.2.2_mx_intel-9.1-f040-c045/fftw-2.1.5
-
-FFT_INC =       -DFFT_FFTW -I$(FFTW)/include
-FFT_PATH =	-L$(FFTW)/lib
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.stampede b/src/MAKE/MORE/Makefile.stampede
deleted file mode 100755
index 8c9591d11..000000000
--- a/src/MAKE/MORE/Makefile.stampede
+++ /dev/null
@@ -1,109 +0,0 @@
-# Stampede, Intel Compiler, MKL FFT, Offload to Xeon Phi
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpicc -openmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64
-MIC_OPT =       -offload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""
-CCFLAGS =	-O3 -xAVX -fno-alias -ansi-alias -restrict -override-limits $(MIC_OPT)
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpicc -openmp
-LINKFLAGS =	-O3 -xAVX
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =      -DFFT_MKL -DFFT_SINGLE -I$(TACC_MKL_INC)
-FFT_PATH = 
-FFT_LIB =	-L$(TACC_MKL_LIB) -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	-ljpeg
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.storm b/src/MAKE/MORE/Makefile.storm
deleted file mode 100644
index 67039fe60..000000000
--- a/src/MAKE/MORE/Makefile.storm
+++ /dev/null
@@ -1,105 +0,0 @@
-# storm = Cray Red Storm XT3, Cray CC, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .d
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		CC
-CCFLAGS =	-fastsse
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		CC
-LINKFLAGS =	-O
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I/projects/fftw/fftw-2.1.5/include
-FFT_PATH = 
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-.cpp.o:
-	$(CC) $(CCFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-$(OBJ):	     $(INC)
diff --git a/src/MAKE/MORE/Makefile.tacc b/src/MAKE/MORE/Makefile.tacc
deleted file mode 100644
index 63d0fbe5f..000000000
--- a/src/MAKE/MORE/Makefile.tacc
+++ /dev/null
@@ -1,111 +0,0 @@
-# tacc = UT Lonestar TACC machine, mpiCC, MPI, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpiCC
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpiCC
-LINKFLAGS =	-O
-LIB =           
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-lmpich -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFTW_INC = ${TACC_FFTW2_INC}
-FFTW_LIB = ${TACC_FFTW2_LIB}
-
-FFT_INC =       -DFFT_FFTW -I${FFTW_INC}
-FFT_PATH =	-L${FFTW_LIB}
-FFT_LIB =	${FFTW_LIB}/libfftw.a
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.tbird b/src/MAKE/MORE/Makefile.tbird
deleted file mode 100644
index 200a12103..000000000
--- a/src/MAKE/MORE/Makefile.tbird
+++ /dev/null
@@ -1,127 +0,0 @@
-# tbird = Dell cluster with Xeons, Intel mpicxx, native MPI, FFTW
-
-SHELL = /bin/sh
-
-# this Makefile builds LAMMPS for openMPI running on Tbird
-# as of April 09, you want these modules loaded, which are not the default:
-#   mpi/openmpi-1.2.8_intel-11.0-f074-c074
-#   misc/env-openmpi-1.2
-#   compilers/intel-11.0-f074-c074
-#   libraries/intel-mkl
-#   libraries/intel_fftw-10.0.4.023
-#   libraries/intel-mkl-11.0.074
-# you can determine which modules are loaded by typing:
-#   module list
-# you can load these modules by putting
-#   these lines in your .cshrc or other start-up shell file
-#   or by typing them before you build LAMMPS:
-#     module switch mpi mpi/openmpi-1.2.8_intel-11.0-f074-c074
-#     module load libraries/intel_fftw-10.0.4.023
-#     module load libraries/intel-mkl-11.0.074
-# these same modules need to be loaded to submit a LAMMPS job,
-#   either interactively or via a batch script
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpicxx
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpicxx
-LINKFLAGS =	-O
-LIB =           -lstdc++ -lm
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-lmpich -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I$(FFTW_INCLUDE)
-FFT_PATH = 
-FFT_LIB =	$(BLASLIB) $(FFTW_LINK_LINE)
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.tesla b/src/MAKE/MORE/Makefile.tesla
deleted file mode 100755
index 29062a098..000000000
--- a/src/MAKE/MORE/Makefile.tesla
+++ /dev/null
@@ -1,108 +0,0 @@
-# tesla = 16-proc SGI Onyx3, g++, no MPI, SGI FFTs
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		g++
-CCFLAGS =	-O
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		g++
-LINKFLAGS =	-O
-LIB =           -lm -lcomplib.sgimath
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi_stubs
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_SGI
-FFT_PATH = 
-FFT_LIB =	-lcomplib.sgimath
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.tunnison b/src/MAKE/MORE/Makefile.tunnison
deleted file mode 100644
index 94e821922..000000000
--- a/src/MAKE/MORE/Makefile.tunnison
+++ /dev/null
@@ -1,118 +0,0 @@
-# tunnison - 64-bit dual-core Linux cluster, mpic++, OpenMPI-1.1, FFTW2
-
-SHELL = /bin/sh
-
-# this Makefile builds LAMMPS for Tunnison with OpenMPI
-# to invoke this Makefile, you need these modules loaded:
-#   compilers/intel-11.1-f064-c064
-#   misc/env-openmpi-1.4
-#   mpi/openmpi-1.4.1_mx_intel-11.1-f064-c064
-#   libraries/fftw-2.1.5
-# you can determine which modules are loaded by typing:
-#   module list
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpic++
-CCFLAGS =	-O2 \
-		-funroll-loops -fstrict-aliasing -W -Wno-uninitialized
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpic++
-LINKFLAGS =	-O
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rcsv
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       
-MPI_PATH = 
-MPI_LIB =	
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I$(FFTW_INCLUDE)
-FFT_PATH = -L$(FFTW_LIB)
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.ubuntu b/src/MAKE/MORE/Makefile.ubuntu
deleted file mode 100644
index 3d2bf0703..000000000
--- a/src/MAKE/MORE/Makefile.ubuntu
+++ /dev/null
@@ -1,112 +0,0 @@
-# ubuntu = Ubuntu Linux box, g++, openmpi, FFTW3
-
-# you have to install the packages g++, mpi-default-bin, mpi-default-dev,
-# libfftw3-dev, libjpeg-dev and libpng12-dev to compile LAMMPS with this
-# makefile
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpic++
-CCFLAGS =	-g -O3 # -Wunused
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpic++
-LINKFLAGS =	-g -O3
-LIB = 
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG -DLAMMPS_PNG -DLAMMPS_FFMPEG
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =
-MPI_PATH = 
-MPI_LIB =
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =    	-DFFT_FFTW3
-FFT_PATH = 
-FFT_LIB = -lfftw3
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB = -ljpeg -lpng
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.ubuntu_simple b/src/MAKE/MORE/Makefile.ubuntu_simple
deleted file mode 100644
index c74e5da95..000000000
--- a/src/MAKE/MORE/Makefile.ubuntu_simple
+++ /dev/null
@@ -1,111 +0,0 @@
-# ubuntu_simple = Ubuntu Linux box, g++, openmpi, KISS FFT
-
-# you have to install the packages g++, mpi-default-bin and mpi-default-dev 
-# to compile LAMMPS with this makefile
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpic++
-CCFLAGS =	-g -O3 # -Wunused
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpic++
-LINKFLAGS =	-g -O3
-LIB = 
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =
-MPI_PATH = 
-MPI_LIB =
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =
-FFT_PATH = 
-FFT_LIB =
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.xe6 b/src/MAKE/MORE/Makefile.xe6
deleted file mode 100644
index 778297d29..000000000
--- a/src/MAKE/MORE/Makefile.xe6
+++ /dev/null
@@ -1,109 +0,0 @@
-# xe6 = Cray XE6, Cray CC, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .d
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		CC
-CCFLAGS =	-fastsse
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		CC
-LINKFLAGS =	-O
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I/home/sjplimp/fftw/fftw
-FFT_PATH = 	-L/home/sjplimp/fftw/fftw/.libs
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.xt3 b/src/MAKE/MORE/Makefile.xt3
deleted file mode 100644
index 0b23c824d..000000000
--- a/src/MAKE/MORE/Makefile.xt3
+++ /dev/null
@@ -1,110 +0,0 @@
-# xt3 = PSC BigBen Cray XT3, CC, native MPI, FFTW
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		CC
-CCFLAGS =	-O3 --target=catamount \
-                -fomit-frame-pointer -finline-functions \
-		-Wall -Wno-unused -funroll-all-loops
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		CC
-LINKFLAGS =	--target=catamount -O
-LIB =           -lgmalloc
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_XDR
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-lmpich -lpthread
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I$(FFTW_INC) 
-FFT_PATH =	-L$(FFTW_LIB)
-FFT_LIB =	-ldfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MORE/Makefile.xt5 b/src/MAKE/MORE/Makefile.xt5
deleted file mode 100644
index 0965cb13e..000000000
--- a/src/MAKE/MORE/Makefile.xt5
+++ /dev/null
@@ -1,109 +0,0 @@
-# xt5 = Cray XT5, Cray CC, native MPI, FFTW
-
-SHELL = /bin/sh
-.SUFFIXES: .cpp .d
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		CC
-CCFLAGS =	-fastsse
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		CC
-LINKFLAGS =	-O
-LIB =           -lstdc++
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings, OPTIONAL
-# see possible settings in doc/Section_start.html#2_2 (step 4)
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library, REQUIRED
-# see discussion in doc/Section_start.html#2_2 (step 5)
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	
-
-# FFT library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 6)
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I/home/sjplimp/fftw/fftw
-FFT_PATH = 	-L/home/sjplimp/fftw/fftw/.libs
-FFT_LIB =	-lfftw
-
-# JPEG and/or PNG library, OPTIONAL
-# see discussion in doc/Section_start.html#2_2 (step 7)
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# no need to edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)