CMakeLists.txt cleanups