some more cleanup in contrib/packaging