Changed cleanup to warn_only