more package cleanup