Cleaning up for package