cleaning up package xml and CMakeLists