diff --git a/cluster/get-kube.sh b/cluster/get-kube.sh
index f0492d45ac6..b733bd2187e 100755
--- a/cluster/get-kube.sh
+++ b/cluster/get-kube.sh
@@ -24,14 +24,6 @@
 #  Set KUBERNETES_PROVIDER to choose between different providers:
 #  Google Compute Engine [default]
 #   * export KUBERNETES_PROVIDER=gce; wget -q -O - https://get.k8s.io | bash
-#  Libvirt (with CoreOS as a guest operating system)
-#   * export KUBERNETES_PROVIDER=libvirt-coreos; wget -q -O - https://get.k8s.io | bash
-#  Vagrant (local virtual machines)
-#   * export KUBERNETES_PROVIDER=vagrant; wget -q -O - https://get.k8s.io | bash
-#  VMWare Photon Controller
-#   * export KUBERNETES_PROVIDER=photon-controller; wget -q -O - https://get.k8s.io | bash
-#  OpenStack-Heat
-#   * export KUBERNETES_PROVIDER=openstack-heat; wget -q -O - https://get.k8s.io | bash
 #
 #  Set KUBERNETES_RELEASE to choose a specific release instead of the current
 #    stable release, (e.g. 'v1.3.7').
diff --git a/cluster/saltbase/salt/base.sls b/cluster/saltbase/salt/base.sls
index 91639730dd0..c9ccdf5a84c 100644
--- a/cluster/saltbase/salt/base.sls
+++ b/cluster/saltbase/salt/base.sls
@@ -24,20 +24,6 @@ pkg-core:
       - git
 {% endif %}
 
-# Fix ARP cache issues on AWS by setting net.ipv4.neigh.default.gc_thresh1=0
-# See issue #23395
-{% if grains.get('cloud') == 'aws' %}
-# Work around Salt #18089: https://github.com/saltstack/salt/issues/18089
-# (we also have to give it a different id from the same fix elsewhere)
-99-salt-conf-with-a-different-id:
-  file.touch:
-    - name: /etc/sysctl.d/99-salt.conf
-
-net.ipv4.neigh.default.gc_thresh1:
-  sysctl.present:
-    - value: 0
-{% endif %}
-
 /usr/local/share/doc/kubernetes:
   file.directory:
     - user: root
diff --git a/cluster/saltbase/salt/cni/init.sls b/cluster/saltbase/salt/cni/init.sls
index a1d1060d6bd..14f26927fef 100644
--- a/cluster/saltbase/salt/cni/init.sls
+++ b/cluster/saltbase/salt/cni/init.sls
@@ -24,18 +24,3 @@ cni-tar:
     - source_hash: md5=9534876FAE7DBE813CDAB404DC1F9219
     - archive_format: tar
     - if_missing: /home/kubernetes/bin
-
-{% if grains['cloud'] is defined and grains.cloud in [ 'vagrant' ]  %}
-# Install local CNI network plugins in a Vagrant environment
-cmd-local-cni-plugins:
-   cmd.run:
-      - name: |
-         cp -v /vagrant/cluster/network-plugins/cni/bin/* /home/kubernetes/bin/.
-         chmod +x /home/kubernetes/bin/*
-cmd-local-cni-config:
-   cmd.run:
-      - name: |
-         cp -v /vagrant/cluster/network-plugins/cni/config/* /etc/cni/net.d/.
-         chown root:root /etc/cni/net.d/*
-         chmod 744 /etc/cni/net.d/*
-{% endif -%}
diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
index ed1b9186d5a..23ab4cfba1b 100644
--- a/cluster/saltbase/salt/docker/init.sls
+++ b/cluster/saltbase/salt/docker/init.sls
@@ -344,37 +344,6 @@ net.ipv4.ip_forward:
 {% set override_deb_sha1='' %}
 {% set override_docker_ver='' %}
 
-{% elif grains.get('cloud', '') == 'aws'
-   and grains.get('os_family', '') == 'Debian'
-   and grains.get('oscodename', '') == 'jessie' -%}
-# TODO: Get from google storage?
-{% set docker_pkg_name='docker-engine' %}
-{% set override_docker_ver='1.11.2-0~jessie' %}
-{% set override_deb='docker-engine_1.11.2-0~jessie_amd64.deb' %}
-{% set override_deb_url='http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.11.2-0~jessie_amd64.deb' %}
-{% set override_deb_sha1='c312f1f6fa0b34df4589bb812e4f7af8e28fd51d' %}
-
-# Ubuntu presents as os_family=Debian, osfullname=Ubuntu
-{% elif grains.get('cloud', '') == 'aws'
-   and grains.get('os_family', '') == 'Debian'
-   and grains.get('oscodename', '') == 'trusty' -%}
-# TODO: Get from google storage?
-{% set docker_pkg_name='docker-engine' %}
-{% set override_docker_ver='1.11.2-0~trusty' %}
-{% set override_deb='docker-engine_1.11.2-0~trusty_amd64.deb' %}
-{% set override_deb_url='http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.11.2-0~trusty_amd64.deb' %}
-{% set override_deb_sha1='022dee31e68c6d572eaac750915786e4a6729d2a' %}
-
-{% elif grains.get('cloud', '') == 'aws'
-   and grains.get('os_family', '') == 'Debian'
-   and grains.get('oscodename', '') == 'wily' -%}
-# TODO: Get from google storage?
-{% set docker_pkg_name='docker-engine' %}
-{% set override_docker_ver='1.11.2-0~wily' %}
-{% set override_deb='docker-engine_1.11.2-0~wily_amd64.deb' %}
-{% set override_deb_url='http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.11.2-0~wily_amd64.deb' %}
-{% set override_deb_sha1='3e02f51fe18aa777eeb1676c3d9a75e5ea6d96c9' %}
-
 {% else %}
 {% set docker_pkg_name='lxc-docker-1.7.1' %}
 {% set override_docker_ver='1.7.1' %}
@@ -502,19 +471,8 @@ fix-systemd-docker-healthcheck-service:
 {% endif %}
 
 docker:
-# Starting Docker is racy on aws for some reason.  To be honest, since Monit
-# is managing Docker restart we should probably just delete this whole thing
-# but the kubernetes components use salt 'require' to set up a dag, and that
-# complicated and scary to unwind.
-# On AWS, we use a trick now... We don't start the docker service through Salt.
-# Kubelet or our health checker will start it.  But we use service.enabled,
-# so we still have a `service: docker` node for our DAG.
-{% if grains.cloud is defined and grains.cloud == 'aws' %}
-  service.enabled:
-{% else %}
   service.running:
     - enable: True
-{% endif %}
 # If we put a watch on this, salt will try to start the service.
 # We put the watch on the fixer instead
 {% if not pillar.get('is_systemd') %}
diff --git a/cluster/saltbase/salt/generate-cert/init.sls b/cluster/saltbase/salt/generate-cert/init.sls
index 436e5af7f71..4543239afe1 100644
--- a/cluster/saltbase/salt/generate-cert/init.sls
+++ b/cluster/saltbase/salt/generate-cert/init.sls
@@ -1,17 +1,6 @@
 {% set master_extra_sans=grains.get('master_extra_sans', '') %}
-{% if grains.cloud is defined %}
-  {% if grains.cloud == 'gce' %}
-    {% set cert_ip='_use_gce_external_ip_' %}
-  {% endif %}
-  {% if grains.cloud == 'aws' %}
-    {% set cert_ip='_use_aws_external_ip_' %}
-  {% endif %}
-  {% if grains.cloud == 'azure-legacy' %}
-    {% set cert_ip='_use_azure_dns_name_' %}
-  {% endif %}
-  {% if grains.cloud == 'photon-controller' %}
-    {% set cert_ip=grains.ip_interfaces.eth0[0] %}
-  {% endif %}
+{% if grains.cloud is defined and grains.cloud == 'gce' %}
+  {% set cert_ip='_use_gce_external_ip_' %}
 {% endif %}
 
 # If there is a pillar defined, override any defaults.
diff --git a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh b/cluster/saltbase/salt/generate-cert/make-ca-cert.sh
index f4e23a81f9e..41531209ed5 100755
--- a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh
+++ b/cluster/saltbase/salt/generate-cert/make-ca-cert.sh
@@ -38,24 +38,6 @@ if [ "$cert_ip" == "_use_gce_external_ip_" ]; then
   cert_ip=$(curl -s -H Metadata-Flavor:Google http://metadata.google.internal./computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip)
 fi
 
-if [ "$cert_ip" == "_use_aws_external_ip_" ]; then
-  # If there's no public IP assigned (e.g. this host is running on an internal subnet in a VPC), then
-  # curl will happily spit out the contents of AWS's 404 page and an exit code of zero.
-  #
-  # The string containing the 404 page trips up one of easyrsa's calls to openssl later; whichever
-  # one creates the CA certificate, because the 404 page is > 64 characters.
-  if cert_ip=$(curl -f -s http://169.254.169.254/latest/meta-data/public-ipv4); then
-    :
-  else
-    cert_ip=$(curl -f -s http://169.254.169.254/latest/meta-data/local-ipv4)
-  fi
-fi
-
-if [ "$cert_ip" == "_use_azure_dns_name_" ]; then
-  cert_ip=$(uname -n | awk -F. '{ print $2 }').cloudapp.net
-  use_cn=true
-fi
-
 sans="IP:${cert_ip}"
 if [[ -n "${extra_sans}" ]]; then
   sans="${sans},${extra_sans}"
diff --git a/cluster/saltbase/salt/helpers/init.sls b/cluster/saltbase/salt/helpers/init.sls
deleted file mode 100644
index 7e5ad435d6e..00000000000
--- a/cluster/saltbase/salt/helpers/init.sls
+++ /dev/null
@@ -1,14 +0,0 @@
-{% if grains['cloud'] is defined and grains['cloud'] == 'aws' %}
-/usr/share/google:
-  file.directory:
-    - user: root
-    - group: root
-    - dir_mode: 755
-
-/usr/share/google/safe_format_and_mount:
-  file.managed:
-    - source: salt://helpers/safe_format_and_mount
-    - user: root
-    - group: root
-    - mode: 755
-{% endif %}
diff --git a/cluster/saltbase/salt/helpers/safe_format_and_mount b/cluster/saltbase/salt/helpers/safe_format_and_mount
deleted file mode 100644
index 53cfe6cc815..00000000000
--- a/cluster/saltbase/salt/helpers/safe_format_and_mount
+++ /dev/null
@@ -1,144 +0,0 @@
-#! /bin/bash
-# Copyright 2013 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Mount a disk, formatting it if necessary.  If the disk looks like it may
-# have been formatted before, we will not format it.
-#
-# This script uses blkid and file to search for magic "formatted" bytes
-# at the beginning of the disk.  Furthermore, it attempts to use fsck to
-# repair the filesystem before formatting it.
-
-FSCK=fsck.ext4
-MOUNT_OPTIONS="discard,defaults"
-MKFS="mkfs.ext4 -F"
-if [ -e /etc/redhat-release ]; then
-    if grep -q '7\..' /etc/redhat-release; then
-      FSCK=fsck.xfs
-      MKFS=mkfs.xfs
-    fi
-fi
-
-LOGTAG=safe_format_and_mount
-LOGFACILITY=user
-
-function log() {
-  local readonly severity=$1; shift;
-  logger -t ${LOGTAG} -p ${LOGFACILITY}.${severity} -s "$@"
-}
-
-function log_command() {
-  local readonly log_file=$(mktemp)
-  local readonly retcode
-  log info "Running: $*"
-  $* > ${log_file} 2>&1
-  retcode=$?
-  # only return the last 1000 lines of the logfile, just in case it's HUGE.
-  tail -1000 ${log_file} | logger -t ${LOGTAG} -p ${LOGFACILITY}.info -s
-  rm -f ${log_file}
-  return ${retcode}
-}
-
-function help() {
-  cat >&2 <<EOF
-$0 [-f fsck_cmd] [-m mkfs_cmd] [-o mount_opts] <device> <mountpoint>
-EOF
-  exit 0
-}
-
-while getopts ":hf:o:m:" opt; do
-  case $opt in
-    h) help;;
-    f) FSCK=$OPTARG;;
-    o) MOUNT_OPTIONS=$OPTARG;;
-    m) MKFS=$OPTARG;;
-    -) break;;
-    \?) log error "Invalid option: -${OPTARG}"; exit 1;;
-    :) log "Option -${OPTARG} requires an argument."; exit 1;;
-  esac
-done
-
-shift $(($OPTIND - 1))
-readonly DISK=$1
-readonly MOUNTPOINT=$2
-
-[[ -z ${DISK} ]] && help
-[[ -z ${MOUNTPOINT} ]] && help
-
-function disk_looks_unformatted() {
-  blkid ${DISK}
-  if [[ $? == 0 ]]; then
-    return 0
-  fi
-
-  local readonly file_type=$(file --special-files ${DISK})
-  case ${file_type} in
-    *filesystem*)
-      return 0;;
-  esac
-
-  return 1
-}
-
-function format_disk() {
-  log_command ${MKFS} ${DISK}
-}
-
-function try_repair_disk() {
-  log_command ${FSCK} -a ${DISK}
-  local readonly fsck_return=$?
-  if [[ ${fsck_return} -ge 8 ]]; then
-    log error "Fsck could not correct errors on ${DISK}"
-    return 1
-  fi
-  if [[ ${fsck_return} -gt 0 ]]; then
-    log warning "Fsck corrected errors on ${DISK}"
-  fi
-  return 0
-}
-
-function try_mount() {
-  local mount_retcode
-  try_repair_disk
-
-  log_command mount -o ${MOUNT_OPTIONS} ${DISK} ${MOUNTPOINT}
-  mount_retcode=$?
-  if [[ ${mount_retcode} == 0 ]]; then
-    return 0
-  fi
-
-  # Check to see if it looks like a filesystem before formatting it.
-  disk_looks_unformatted ${DISK}
-  if [[ $? == 0 ]]; then
-    log error "Disk ${DISK} looks formatted but won't mount.  Giving up."
-    return ${mount_retcode}
-  fi
-
-  # The disk looks like it's not been formatted before.
-  format_disk
-  if [[ $? != 0 ]]; then
-    log error "Format of ${DISK} failed."
-  fi
-
-  log_command mount -o ${MOUNT_OPTIONS} ${DISK} ${MOUNTPOINT}
-  mount_retcode=$?
-  if [[ ${mount_retcode} == 0 ]]; then
-    return 0
-  fi
-  log error "Tried everything we could, but could not mount ${DISK}."
-  return ${mount_retcode}
-}
-
-try_mount
-exit $?
diff --git a/cluster/saltbase/salt/kube-addons/init.sls b/cluster/saltbase/salt/kube-addons/init.sls
index 3171cb6ca61..923a711a6b8 100644
--- a/cluster/saltbase/salt/kube-addons/init.sls
+++ b/cluster/saltbase/salt/kube-addons/init.sls
@@ -204,7 +204,7 @@ addon-dir-create:
     - group: root
     - mode: 755
 
-{% if pillar.get('enable_default_storage_class', '').lower() == 'true' and grains['cloud'] is defined and grains['cloud'] in ['aws', 'gce', 'openstack'] %}
+{% if pillar.get('enable_default_storage_class', '').lower() == 'true' and grains['cloud'] is defined and grains['cloud'] == 'gce' %}
 /etc/kubernetes/addons/storage-class/default.yaml:
   file.managed:
     - source: salt://kube-addons/storage-class/{{ grains['cloud'] }}/default.yaml
diff --git a/cluster/saltbase/salt/kube-apiserver/init.sls b/cluster/saltbase/salt/kube-apiserver/init.sls
index f22067b877c..261fd53ef35 100644
--- a/cluster/saltbase/salt/kube-apiserver/init.sls
+++ b/cluster/saltbase/salt/kube-apiserver/init.sls
@@ -1,4 +1,4 @@
-{% if grains['cloud'] is defined and grains.cloud in ['aws', 'gce', 'vagrant', 'photon-controller', 'openstack'] %}
+{% if grains['cloud'] is defined and grains.cloud == 'gce' %}
 # TODO: generate and distribute tokens on other cloud providers.
 /srv/kubernetes/known_tokens.csv:
   file.managed:
diff --git a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
index 878b10f43bf..34e75ac7a89 100644
--- a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
+++ b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
@@ -14,24 +14,14 @@
 {% set srv_sshproxy_path = "/srv/sshproxy" -%}
 
 {% if grains.cloud is defined -%}
-  {% if grains.cloud not in ['vagrant', 'photon-controller', 'azure-legacy'] -%}
-    {% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
-  {% endif -%}
+  {% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
 
-  {% if grains.cloud in [ 'openstack' ] and grains.cloud_config is defined -%}
-    {% set cloud_config = "--cloud-config=" + grains.cloud_config -%}
-  {% endif -%}
-
-  {% if grains.cloud in [ 'aws', 'gce' ] and grains.cloud_config is defined -%}
+  {% if grains.cloud == 'gce' and grains.cloud_config is defined -%}
     {% set cloud_config = "--cloud-config=" + grains.cloud_config -%}
     {% set cloud_config_mount = "{\"name\": \"cloudconfigmount\",\"mountPath\": \"" + grains.cloud_config + "\", \"readOnly\": true}," -%}
     {% set cloud_config_volume = "{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"" + grains.cloud_config + "\", \"type\": \"FileOrCreate\"}}," -%}
   {% endif -%}
 
-  {% if grains.cloud in ['openstack'] -%}
-    {% set cloud_config_mount = "{\"name\": \"instanceid\",\"mountPath\": \"/var/lib/cloud/data/instance-id\",\"readOnly\": true}," -%}
-    {% set cloud_config_volume = "{\"name\": \"instanceid\",\"hostPath\": {\"path\": \"/var/lib/cloud/data/instance-id\"}}," -%}
-  {% endif -%}
 {% endif -%}
 
 {% set advertise_address = "" -%}
@@ -99,7 +89,7 @@
 {% set client_ca_file = "" -%}
 
 {% set secure_port = "6443" -%}
-{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant', 'photon-controller', 'openstack']    %}
+{% if grains['cloud'] is defined and grains.cloud == 'gce' %}
   {% set secure_port = "443" -%}
   {% set client_ca_file = "--client-ca-file=/srv/kubernetes/ca.crt" -%}
 {% endif -%}
@@ -113,7 +103,7 @@
 {% set basic_auth_file = "" -%}
 {% set authz_mode = "" -%}
 {% set abac_policy_file = "" -%}
-{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant', 'photon-controller', 'openstack']  %}
+{% if grains['cloud'] is defined and grains.cloud == 'gce' %}
   {% set token_auth_file = " --token-auth-file=/srv/kubernetes/known_tokens.csv" -%}
   {% set basic_auth_file = " --basic-auth-file=/srv/kubernetes/basic_auth.csv" -%}
   {% set authz_mode = " --authorization-mode=ABAC" -%}
diff --git a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
index c287b29652e..74353d07f6f 100644
--- a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
+++ b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
@@ -40,30 +40,20 @@
 {% flex_vol_plugin_dir = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec" -%}
 
 {% if grains.cloud is defined -%}
-  {% if grains.cloud not in ['vagrant', 'photon-controller', 'azure-legacy'] -%}
-    {% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
-  {% endif -%}
+  {% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
   {% set service_account_key = "--service-account-private-key-file=/srv/kubernetes/server.key" -%}
 
-  {% if grains.cloud in [ 'openstack' ] and grains.cloud_config is defined -%}
-    {% set cloud_config = "--cloud-config=" + grains.cloud_config -%}
-  {% endif -%}
-
-  {% if grains.cloud in [ 'aws', 'gce' ] and grains.cloud_config is defined -%}
+  {% if grains.cloud == 'gce' and grains.cloud_config is defined -%}
     {% set cloud_config = "--cloud-config=" + grains.cloud_config -%}
     {% set cloud_config_mount = "{\"name\": \"cloudconfigmount\",\"mountPath\": \"" + grains.cloud_config + "\", \"readOnly\": true}," -%}
     {% set cloud_config_volume = "{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"" + grains.cloud_config + "\", \"type\": \"FileOrCreate\"}}," -%}
   {% endif -%}
 
-  {% if grains.cloud in ['openstack'] -%}
-    {% set cloud_config_mount = "{\"name\": \"instanceid\",\"mountPath\": \"/var/lib/cloud/data/instance-id\",\"readOnly\": true}," -%}
-    {% set cloud_config_volume = "{\"name\": \"instanceid\",\"hostPath\": {\"path\": \"/var/lib/cloud/data/instance-id\"}}," -%}
-  {% endif -%}
 {% endif -%}
 
 {% set root_ca_file = "" -%}
 
-{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant', 'photon-controller', 'openstack', 'azure-legacy']    %}
+{% if grains.cloud is defined and grains.cloud == 'gce' %}
    {% set root_ca_file = "--root-ca-file=/srv/kubernetes/ca.crt" -%}
 {% endif -%}
 
diff --git a/cluster/saltbase/salt/kube-node-unpacker/init.sls b/cluster/saltbase/salt/kube-node-unpacker/init.sls
index 03495d7fe18..7c9d47eccc0 100644
--- a/cluster/saltbase/salt/kube-node-unpacker/init.sls
+++ b/cluster/saltbase/salt/kube-node-unpacker/init.sls
@@ -24,10 +24,6 @@ kube-proxy-tar:
 {% set is_helium = '0' %}
 # Super annoying, the salt version on GCE is old enough that 'salt.cmd.run'
 # isn't supported
-{% if grains.cloud is defined and grains.cloud == 'aws' %}
-   # Salt has terrible problems with systemd on AWS too
-   {% set is_helium = '0' %}
-{% endif %}
 # Salt Helium doesn't support systemd modules for service running
 {% if pillar.get('is_systemd') and is_helium == '0' %}
 
diff --git a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
index d35692a3fd4..6e9af81b78f 100644
--- a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
+++ b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
@@ -8,7 +8,7 @@
   {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
   {% set api_servers = "--master=https://" + ips[0][0] -%}
 {% endif -%}
-{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant', 'photon-controller', 'openstack', 'azure-legacy' ]  %}
+{% if grains['cloud'] is defined and grains.cloud == 'gce'  %}
   {% set api_servers_with_port = api_servers -%}
 {% else -%}
   {% set api_servers_with_port = api_servers + ":6443" -%}
diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index 27511061e84..c2aff4694a7 100644
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -22,7 +22,7 @@
 {% set debugging_handlers = "--enable-debugging-handlers=true" -%}
 
 {% if grains['roles'][0] == 'kubernetes-master' -%}
-  {% if grains.cloud in ['aws', 'gce', 'vagrant', 'photon-controller', 'openstack', 'azure-legacy'] -%}
+  {% if grains.cloud == 'gce' -%}
     # Unless given a specific directive, disable registration for the kubelet
     # running on the master.
     {% if kubeconfig != "" -%}
@@ -37,14 +37,11 @@
 {% endif -%}
 
 {% set cloud_provider = "" -%}
-{% if grains.cloud is defined and grains.cloud not in ['vagrant', 'photon-controller', 'azure-legacy'] -%}
+{% if grains.cloud is defined -%}
   {% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
 {% endif -%}
 
 {% set cloud_config = "" -%}
-{% if grains.cloud in [ 'openstack' ] and grains.cloud_config is defined -%}
-  {% set cloud_config = "--cloud-config=" + grains.cloud_config -%}
-{% endif -%}
 
 {% set config = "--pod-manifest-path=/etc/kubernetes/manifests" -%}
 
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index e517778a77e..51c3a347cca 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -3,9 +3,6 @@ base:
     - base
     - debian-auto-upgrades
     - salt-helpers
-{% if grains.get('cloud') == 'aws' %}
-    - ntp
-{% endif %}
 {% if pillar.get('e2e_storage_test_environment', '').lower() == 'true' %}
     - e2e
 {% endif %}
@@ -20,7 +17,6 @@ base:
 {% elif pillar.get('network_provider', '').lower() == 'cni' %}
     - cni
 {% endif %}
-    - helpers
     - kube-client-tools
     - kube-node-unpacker
     - kubelet
@@ -60,11 +56,9 @@ base:
     - kube-client-tools
     - kube-master-addons
     - kube-admission-controls
-{% if grains['cloud'] is defined and grains['cloud'] != 'vagrant' %}
     - logrotate
-{% endif %}
     - kube-addons
-{% if grains['cloud'] is defined and grains['cloud'] in [ 'vagrant', 'gce', 'aws', 'photon-controller', 'openstack', 'azure-legacy'] %}
+{% if grains['cloud'] is defined and grains['cloud'] == 'gce' %}
     - docker
     - kubelet
 {% endif %}