Added storage clean-up setting and coded it up