Clean-up CMakeLists.txt