diff --git a/devstack/lib/barbican b/devstack/lib/barbican
index d186b4693..2a3a84645 100644
--- a/devstack/lib/barbican
+++ b/devstack/lib/barbican
@@ -235,11 +235,6 @@ function start_barbican {
 
 # stop_barbican - Stop running processes
 function stop_barbican {
-    # This will eventually be refactored to work like
-    # Solum and Manila (script to kick off a wsgiref server)
-    # For now, this will stop uWSGI rather than have it hang
-    killall -9 uwsgi
-
     # This cleans up the PID file, but uses pkill so Barbican
     # uWSGI emperor process doesn't actually stop
     stop_process barbican-svc