Cleanup from cask upgrade