Added storage cleaning functions.