cleanup
+test and update package.xml