Cleaning up CMakeLists.txts