CMake fixes, clean old Makefiles.