diff --git a/elements/undercloud-install/post-install.d/50-tripleo-incubator-path b/elements/undercloud-install/post-install.d/50-tripleo-incubator-path
deleted file mode 100755
index e88a33f1e..000000000
--- a/elements/undercloud-install/post-install.d/50-tripleo-incubator-path
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-# Add scripts directory from tripleo-incubator and diskimage-builder to the
-# path.
-# These scripts can't just be symlinked into a bin directory because they do
-# directory manipulation that assumes they're in a known location.
-if [ ! -e /etc/profile.d/tripleo-incubator-scripts.sh ]; then
-    sudo bash -c "echo export PATH='\$PATH':/opt/stack/tripleo-incubator/scripts/ >> /etc/profile.d/tripleo-incubator-scripts.sh"
-    sudo bash -c "echo export PATH=/opt/stack/diskimage-builder/bin/:'\$PATH' >> /etc/profile.d/tripleo-incubator-scripts.sh"
-fi
-
diff --git a/elements/undercloud-install/post-install.d/75-heat-template-wait-condition b/elements/undercloud-install/post-install.d/75-heat-template-wait-condition
deleted file mode 100755
index 899e4e787..000000000
--- a/elements/undercloud-install/post-install.d/75-heat-template-wait-condition
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-sed -i "s/OS::Heat::UpdateWaitConditionHandle/AWS::CloudFormation::WaitConditionHandle/g" /opt/stack/tripleo-heat-templates/overcloud-source.yaml
diff --git a/elements/undercloud-stack-config/element-deps b/elements/undercloud-stack-config/element-deps
index 721fd72b2..33d7e82b2 100644
--- a/elements/undercloud-stack-config/element-deps
+++ b/elements/undercloud-stack-config/element-deps
@@ -1,3 +1 @@
-tripleo-incubator
-tripleo-heat-templates
 os-refresh-config