Move cleanup to the individual checks