first storage version with auto cleanup