Added storage cleaning