Enhance logs
Remove failure storage