Cleanup for packaging