diff --git a/Exercises/tools_minimd/MPI-Stubs/Makefile.mingw32-cross b/Exercises/tools_minimd/MPI-Stubs/Makefile.mingw32-cross
deleted file mode 100644
index 8bc6d621..00000000
--- a/Exercises/tools_minimd/MPI-Stubs/Makefile.mingw32-cross
+++ /dev/null
@@ -1,37 +0,0 @@
-# Makefile for MPI stubs - edit this for your platform
-
-SHELL = /bin/sh
-.IGNORE:
-
-# Files
-
-SRC =		mpi.c
-INC =		mpi.h
-
-# Definitions
-
-EXE =		libmpi_mingw32.a
-OBJ = 		$(SRC:%.c=%_mingw32.o)
-
-# System-specific settings
-
-CC =	        i686-w64-mingw32-gcc
-CCFLAGS =	-O2 -Wall -march=i686 -mtune=generic -mfpmath=387 -mpc64
-ARCHIVE =	i686-w64-mingw32-ar
-ARCHFLAG =	rs
-
-# Target
-
-$(EXE):	$(OBJ)
-	$(ARCHIVE) $(ARCHFLAG) $(EXE) $(OBJ)
-
-# Clean
-
-clean:
-	rm $(EXE) $(OBJ)
-
-# Compilation rules
-
-$(OBJ): $(SRC) $(INC)
-	$(CC) $(CCFLAGS) -c $< -o $@
-
diff --git a/Exercises/tools_minimd/MPI-Stubs/Makefile.mingw64-cross b/Exercises/tools_minimd/MPI-Stubs/Makefile.mingw64-cross
deleted file mode 100644
index 2ef8d7fd..00000000
--- a/Exercises/tools_minimd/MPI-Stubs/Makefile.mingw64-cross
+++ /dev/null
@@ -1,37 +0,0 @@
-# Makefile for MPI stubs - edit this for your platform
-
-SHELL = /bin/sh
-.IGNORE:
-
-# Files
-
-SRC =		mpi.c
-INC =		mpi.h
-
-# Definitions
-
-EXE =		libmpi_mingw64.a
-OBJ = 		$(SRC:%.c=%_mingw64.o)
-
-# System-specific settings
-
-CC =	        x86_64-w64-mingw32-gcc
-CCFLAGS =	-O2 -Wall -march=core2 -mtune=core2 -msse2 -mpc64
-ARCHIVE =	x86_64-w64-mingw32-ar
-ARCHFLAG =	rs
-
-# Target
-
-$(EXE):	$(OBJ)
-	$(ARCHIVE) $(ARCHFLAG) $(EXE) $(OBJ)
-
-# Clean
-
-clean:
-	rm $(EXE) $(OBJ)
-
-# Compilation rules
-
-$(OBJ): $(SRC) $(INC)
-	$(CC) $(CCFLAGS) -c $< -o $@
-
diff --git a/Exercises/tools_minimd/Makefile.no-mpi b/Exercises/tools_minimd/Makefile.no-mpi
deleted file mode 100644
index dbd4ae90..00000000
--- a/Exercises/tools_minimd/Makefile.no-mpi
+++ /dev/null
@@ -1,52 +0,0 @@
-#Set the path to MPI
-#MPI_PATH = /home/projects/x86-64/openmpi/1.8.4/gcc/4.8.4/cuda/7.0
-MPI_PATH = ./MPI-Stubs
-
-#Set the path to Kokkos
-KOKKOS_PATH = ${HOME}/Kokkos/kokkos
-#Set the Devices to compile for
-KOKKOS_DEVICES=Cuda
-#Set the Architecture to compiler for
-KOKKOS_ARCH=SNB,Volta70
-
-
-CXXFLAGS = -O3 
-LINKFLAGS = 
-LIB =
-
-#CXX = ${MPI_PATH}/bin/mpicxx
-CXX = ${KOKKOS_PATH}/bin/nvcc_wrapper
-CXXFLAGS += -I${MPI_PATH}
-LIB += ${MPI_PATH}/libmpi_stubs.a
-
-#CXXFLAGS += -DTEST_LAMBDA_BYCOPY
-#CXXFLAGS += -DTEST_LAMBDA_BYPTR
-LINK = ${CXX}
-EXE = miniMD
-
-default: all
-
-include $(KOKKOS_PATH)/Makefile.kokkos
-
-SRC = $(wildcard *.cpp) 
-HEADERS = $(wildcard *.h)
-DEPFLAGS = -M
-
-OBJ = $(SRC:.cpp=.o)
-
-
-all: $(OBJ) $(KOKKOS_LINK_DEPENDS)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(KOKKOS_LDFLAGS) $(KOKKOS_LIBS) $(LIB) -o $(EXE)
-
-clean: 
-	rm *.o *.d libkokkos.a *.cuda *.host
-
-EXTRA_FLAGS = $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS)
-# Compilation rules
-
-%.o:%.cpp $(KOKKOS_CPP_DEPENDS) $(HEADERS)
-	$(CXX) $(CXXFLAGS) $(EXTRA_FLAGS) -c $<
-
-# Individual dependencies
-
-
diff --git a/README.md b/README.md
index 51369c8b..0d88b6c9 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Tutorials in the **Intro-Full** directory cover
 
 # Building the Tutorials
 
-All the tutorial folders can be built using either the `Makefile` or the CMake `CMakeLists.txt` file in each folder.
+All the tutorial folders can be built using CMake.
 
 ## CMake