packages: some cleanup.
Merge pull request #1 from mrjbq7/cleanup

packages: some cleanup.