storage updates/clean-up