Cleaned up CMake files