cleanup package.xml and CMakeLists.txt