more package cleanup
14 files changed