Add cask cleanup to upgrade