Fix cleanup of storage