Cleanup for packaging.