Remove CMake
Definitive name for makefile
Optimize makefile
Fixes