cleaning up and removals
Merge branch 'master' of https://github.com/lassenorgaard/cocktail