Cleanup CMakeLists.txt