diff --git a/scripts/19-cleanup.sh b/scripts/19-cleanup.sh
deleted file mode 100755
index 46b8d3d..0000000
--- a/scripts/19-cleanup.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-ip -all netns delete
diff --git a/scripts/99-deployment.sh b/scripts/99-deployment.sh
index a289789..3371790 100755
--- a/scripts/99-deployment.sh
+++ b/scripts/99-deployment.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-WEDGE_PASS="sudopasswordforwedge"
+WEDGE_PASS="TheWedgePassword"
 USER_PASS="asdf1234"
 
 run_script_via_ssh() {
@@ -40,6 +40,7 @@ wedge_setup() {
   ssh ncs-wedge "echo $WEDGE_PASS | sudo -S systemctl daemon-reload"
   ssh ncs-wedge "echo $WEDGE_PASS | sudo -S systemctl start l1switch.service"
 
+  # We could probably wait on port 9999 opening on the wedge
   echo "WAITING FOR BFSHELL..."
   sleep 30
 
@@ -74,3 +75,9 @@ ssh ncs-node2 "echo $USER_PASS | sudo -S timeout $TIMEOUT ip netns exec tb_node2
 
 # Get log
 scp ncs-node1:timestamps_30123 .
+
+# Cleanup
+
+ssh ncs-wedge "echo $WEDGE_PASS | sudo -S systemctl stop l1switch.service"
+ssh ncs-node1 "echo $USER_PASS | sudo -S ip -all netns delete "
+ssh ncs-node2 "echo $USER_PASS | sudo -S ip -all netns delete "