Cleanup on storage options