Some cleanup in CMakeLists.txt