Re: Backend storage clean-up