Some cleanup of CMake files