packaging: clean-up