diff --git a/bin/nova-all b/bin/nova-all
deleted file mode 100755
index f419b28255f3..000000000000
--- a/bin/nova-all
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import all
-
-all.main()
diff --git a/bin/nova-api b/bin/nova-api
deleted file mode 100755
index 4620dfc21786..000000000000
--- a/bin/nova-api
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import api
-
-api.main()
diff --git a/bin/nova-api-ec2 b/bin/nova-api-ec2
deleted file mode 100755
index 9b14cf658a9c..000000000000
--- a/bin/nova-api-ec2
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import api_ec2
-
-api_ec2.main()
diff --git a/bin/nova-api-metadata b/bin/nova-api-metadata
deleted file mode 100755
index 5ea1ce4f4e99..000000000000
--- a/bin/nova-api-metadata
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import api_metadata
-
-api_metadata.main()
diff --git a/bin/nova-api-os-compute b/bin/nova-api-os-compute
deleted file mode 100755
index 8ce4900136c7..000000000000
--- a/bin/nova-api-os-compute
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import api_os_compute
-
-api_os_compute.main()
diff --git a/bin/nova-baremetal-deploy-helper b/bin/nova-baremetal-deploy-helper
deleted file mode 100755
index 09cf72b326ef..000000000000
--- a/bin/nova-baremetal-deploy-helper
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import baremetal_deploy_helper
-
-
-baremetal_deploy_helper.main()
diff --git a/bin/nova-baremetal-manage b/bin/nova-baremetal-manage
deleted file mode 100755
index f84459c44fd0..000000000000
--- a/bin/nova-baremetal-manage
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import baremetal_manage
-
-baremetal_manage.main()
diff --git a/bin/nova-cells b/bin/nova-cells
deleted file mode 100755
index 763560b0203e..000000000000
--- a/bin/nova-cells
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import cells
-
-cells.main()
diff --git a/bin/nova-cert b/bin/nova-cert
deleted file mode 100755
index 0cf04e0eaa59..000000000000
--- a/bin/nova-cert
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import cert
-
-cert.main()
diff --git a/bin/nova-clear-rabbit-queues b/bin/nova-clear-rabbit-queues
deleted file mode 100755
index 8de7c6d9e174..000000000000
--- a/bin/nova-clear-rabbit-queues
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import clear_rabbit_queues
-
-clear_rabbit_queues.main()
diff --git a/bin/nova-compute b/bin/nova-compute
deleted file mode 100755
index a2ab0d18be98..000000000000
--- a/bin/nova-compute
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import compute
-
-compute.main()
diff --git a/bin/nova-conductor b/bin/nova-conductor
deleted file mode 100755
index d88fe264da67..000000000000
--- a/bin/nova-conductor
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import conductor
-
-conductor.main()
diff --git a/bin/nova-console b/bin/nova-console
deleted file mode 100755
index bf6f0539d3de..000000000000
--- a/bin/nova-console
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import console
-
-console.main()
diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth
deleted file mode 100755
index 3de6bc2d3027..000000000000
--- a/bin/nova-consoleauth
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import consoleauth
-
-consoleauth.main()
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
deleted file mode 100755
index de65f999d51f..000000000000
--- a/bin/nova-dhcpbridge
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import dhcpbridge
-
-dhcpbridge.main()
diff --git a/bin/nova-manage b/bin/nova-manage
deleted file mode 100755
index 10169e0197e1..000000000000
--- a/bin/nova-manage
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-
-# Temporary shim to do a devstack transition
-from nova.cmd import manage
-
-manage.main()
diff --git a/bin/nova-network b/bin/nova-network
deleted file mode 100755
index d561daab841c..000000000000
--- a/bin/nova-network
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import network
-
-network.main()
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy
deleted file mode 100755
index c0715a7a2002..000000000000
--- a/bin/nova-novncproxy
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import novncproxy
-
-novncproxy.main()
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
deleted file mode 100755
index d0fafbf2fcaa..000000000000
--- a/bin/nova-objectstore
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import objectstore
-
-objectstore.main()
diff --git a/bin/nova-rootwrap b/bin/nova-rootwrap
deleted file mode 100755
index 5e3c4fa23d0a..000000000000
--- a/bin/nova-rootwrap
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.openstack.common.rootwrap import cmd
-
-cmd.main()
diff --git a/bin/nova-rpc-zmq-receiver b/bin/nova-rpc-zmq-receiver
deleted file mode 100755
index 3afe3ed27a81..000000000000
--- a/bin/nova-rpc-zmq-receiver
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import rpc_zmq_receiver
-
-rpc_zmq_receiver.main()
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
deleted file mode 100755
index b53998f41989..000000000000
--- a/bin/nova-scheduler
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import scheduler
-
-scheduler.main()
diff --git a/bin/nova-spicehtml5proxy b/bin/nova-spicehtml5proxy
deleted file mode 100755
index 3ec489b788af..000000000000
--- a/bin/nova-spicehtml5proxy
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import spicehtml5proxy
-
-spicehtml5proxy.main()
diff --git a/bin/nova-xvpvncproxy b/bin/nova-xvpvncproxy
deleted file mode 100755
index 2ca0f7ff95d2..000000000000
--- a/bin/nova-xvpvncproxy
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-
-# Temporary shim to do a devstack transition
-from nova.cmd import xvpvncproxy
-
-xvpvncproxy.main()
diff --git a/nova/paths.py b/nova/paths.py
index 8d84289ae00f..8d8a632c07cf 100644
--- a/nova/paths.py
+++ b/nova/paths.py
@@ -18,6 +18,7 @@
 #    under the License.
 
 import os
+import sys
 
 from oslo.config import cfg
 
@@ -27,7 +28,7 @@ path_opts = [
                                                     '../')),
                help='Directory where the nova python module is installed'),
     cfg.StrOpt('bindir',
-               default='$pybasedir/bin',
+               default=os.path.join(sys.prefix, 'local', 'bin'),
                help='Directory where nova binaries are installed'),
     cfg.StrOpt('state_path',
                default='$pybasedir',
diff --git a/tox.ini b/tox.ini
index f787ccc05e83..90276d26b870 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,6 @@ downloadcache = ~/cache/pip
 sitepackages = False
 commands =
   flake8 {posargs}
-  flake8 --filename=nova* bin
 
 [testenv:pylint]
 setenv = VIRTUAL_ENV={envdir}