diff --git a/Gruntfile.js b/Gruntfile.js
index be4d85423c..34bc73e196 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -155,20 +155,10 @@ module.exports = function (grunt) {
 
     // docker binaries
     'download-binary': {
-      docker: {
-        version: packagejson['docker-version'],
-        binary: path.join('resources', 'docker'),
-        download: 'curl:docker'
-      },
       'docker-machine': {
         version: packagejson['docker-machine-version'],
         binary: path.join('resources', 'docker-machine'),
         download: 'curl:docker-machine'
-      },
-      'docker-compose': {
-        version: packagejson['docker-compose-version'],
-        binary: path.join('resources', 'docker-compose'),
-        download: 'curl:docker-compose'
       }
     },
 
@@ -233,18 +223,10 @@ module.exports = function (grunt) {
 
     // download binaries
     curl: {
-      docker: {
-        src: process.platform === 'win32' ? WINDOWS_DOCKER_URL : DARWIN_DOCKER_URL,
-        dest: process.platform === 'win32' ? path.join('resources', 'docker.exe') : path.join('resources', 'docker')
-      },
       'docker-machine': {
         src: process.platform === 'win32' ? WINDOWS_DOCKER_MACHINE_URL : DARWIN_DOCKER_MACHINE_URL,
         dest: process.platform === 'win32' ? path.join('resources', 'docker-machine.exe') : path.join('resources', 'docker-machine')
       },
-      'docker-compose': {
-        src: DARWIN_COMPOSE_URL,
-        dest: 'resources/docker-compose'
-      },
       'boot2docker-iso': {
         src: BOOT2DOCKER_ISO_URL,
         dest: path.join('resources', 'boot2docker.iso')
@@ -378,14 +360,10 @@ module.exports = function (grunt) {
     }
   });
 
-  if (process.platform === 'win32') {
-    grunt.registerTask('default', ['download-binary:docker', 'download-binary:docker-machine', 'download-boot2docker-iso', 'newer:babel', 'less', 'newer:copy:dev', 'shell:electron', 'watchChokidar']);
-  } else {
-    grunt.registerTask('default', ['download-binary', 'download-boot2docker-iso', 'newer:babel', 'less', 'newer:copy:dev', 'shell:electron', 'watchChokidar']);
-  }
+  grunt.registerTask('default', ['download-binary', 'download-boot2docker-iso', 'newer:babel', 'less', 'newer:copy:dev', 'shell:electron', 'watchChokidar']);
 
   if (process.platform === 'win32') {
-    grunt.registerTask('release', ['clean:release', 'download-binary:docker', 'download-binary:docker-machine', 'download-boot2docker-iso', 'babel', 'less', 'copy:dev', 'electron:windows', 'copy:windows', 'rcedit:exes', 'prompt:create-windows-installer', 'create-windows-installer', 'rename:installer']);
+    grunt.registerTask('release', ['clean:release', 'download-binary', 'download-boot2docker-iso', 'babel', 'less', 'copy:dev', 'electron:windows', 'copy:windows', 'rcedit:exes', 'prompt:create-windows-installer', 'create-windows-installer', 'rename:installer']);
   } else {
     grunt.registerTask('release', ['clean:release', 'download-binary', 'download-boot2docker-iso', 'babel', 'less', 'copy:dev', 'electron:osx', 'copy:osx', 'plistbuddy', 'shell:sign', 'shell:zip']);
   }
diff --git a/package.json b/package.json
index 6e93a43b22..c46f9f2ca1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Kitematic",
-  "version": "0.7.6",
+  "version": "0.8.0",
   "author": "Kitematic",
   "description": "Simple Docker Container management for Mac OS X.",
   "homepage": "https://kitematic.com/",
@@ -24,7 +24,6 @@
   ],
   "docker-version": "1.7.1",
   "docker-machine-version": "0.3.1-rc1",
-  "docker-compose-version": "1.3.0",
   "electron-version": "0.27.2",
   "virtualbox-version": "5.0.0",
   "virtualbox-filename": "VirtualBox-5.0.0.pkg",
diff --git a/resources/terminal b/resources/terminal
index af5af69872..3fb48c26c8 100755
--- a/resources/terminal
+++ b/resources/terminal
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-PATH=$DIR:$PATH
-CMD="export PATH='$PATH' && clear && $*"
+CMD="$*"
 
 ITERM_EXISTS=`osascript <<EOF
 set doesExist to false
diff --git a/src/menutemplate.js b/src/menutemplate.js
index 9c264d1d79..0f9eda4092 100644
--- a/src/menutemplate.js
+++ b/src/menutemplate.js
@@ -42,35 +42,9 @@ var MenuTemplate = function () {
         type: 'separator'
       },
       {
-        label: 'Install Docker Commands',
-        enabled: true,
-        click: function () {
-          metrics.track('Installed Docker Commands');
-          if (!setupUtil.shouldUpdateBinaries()) {
-            dialog.showMessageBox({
-              message: 'Docker binaries are already installed in /usr/local/bin',
-              buttons: ['OK']
-            });
-            return;
-          }
-
-          let copy = setupUtil.needsBinaryFix() ?
-               util.exec(setupUtil.macSudoCmd(setupUtil.copyBinariesCmd() + ' && ' + setupUtil.fixBinariesCmd())) :
-               util.exec(setupUtil.copyBinariesCmd());
-
-          copy.then(() => {
-            dialog.showMessageBox({
-              message: 'Docker binaries have been installed under /usr/local/bin',
-              buttons: ['OK']
-            });
-          }).catch((err) => {
-            console.log(err);
-          });
-        },
+        type: 'separator'
       },
       {
-        type: 'separator'
-      }, {
         label: 'Hide Kitematic',
         accelerator: util.CommandOrCtrl() + '+H',
         selector: 'hide:'