Added cleanup for storage memory