Clearing out some cruft in CMake files