Cleaned up storage package