Added cask specific cleanup