Cleaning up package stuff.