CMakeLists simplification and cleanup