Removing what's not needed and update CMake