FIXED don't fail cleanup task