Changed cleanup to leave less of a mess