Moving cleanup to it's own pull request