CMakeLists cleanups