diff --git a/nova/virt/baremetal/doc/README.rst b/nova/virt/baremetal/doc/README.rst
deleted file mode 100644
index 38a0f4ee4..000000000
--- a/nova/virt/baremetal/doc/README.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-General Bare-metal Provisioning README
-======================================
-
-:Authors:
-  [USC/ISI] Mikyung Kang <mkkang@isi.edu>, David Kang <dkang@isi.edu>
-
-  [NTT DOCOMO] Ken Igarashi <igarashik@nttdocomo.co.jp>
-
-  [VirtualTech Japan Inc.] Arata Notsu <notsu@virtualtech.jp>
-:Date:   2012-08-02
-:Version: 2012.8
-:Wiki: http://wiki.openstack.org/GeneralBareMetalProvisioningFramework
-
-Code changes
-------------
-
-::
-
-  nova/nova/virt/baremetal/*
-  nova/nova/virt/driver.py
-  nova/nova/tests/baremetal/*
-  nova/nova/tests/compute/test_compute.py
-  nova/nova/compute/manager.py
-  nova/nova/compute/resource_tracker.py
-  nova/nova/manager.py
-  nova/nova/scheduler/driver.py
-  nova/nova/scheduler/filter_scheduler.py
-  nova/nova/scheduler/host_manager.py
-  nova/nova/scheduler/baremetal_host_manager.py
-  nova/bin/bm_deploy_server
-  nova/bin/nova-bm-manage
-
-Additional setting for bare-metal provisioning [nova.conf]
-----------------------------------------------------------
-
-::
-
-  # baremetal database connection
-  baremetal_sql_connection = mysql://$ID:$Password@$IP/nova_bm
-
-  # baremetal compute driver
-  compute_driver = nova.virt.baremetal.driver.BareMetalDriver
-  baremetal_driver = {nova.virt.baremetal.tilera.Tilera | nova.virt.baremetal.pxe.PXE}
-  power_manager = {nova.virt.baremetal.tilera_pdu.Pdu | nova.virt.baremetal.ipmi.Ipmi}
-
-  # flavor_extra_specs this baremetal compute
-  flavor_extra_specs = cpu_arch:{tilepro64 | x86_64 | arm}
-
-  # TFTP root
-  baremetal_tftp_root = /tftpboot
-
-  # baremetal scheduler host manager
-  scheduler_host_manager = nova.scheduler.baremetal_host_manager.BaremetalHostManager
-
-
-Non-PXE (Tilera) Bare-metal Provisioning
-----------------------------------------
-
-1. tilera-bm-instance-creation.rst
-
-2. tilera-bm-installation.rst
-
-PXE Bare-metal Provisioning
----------------------------
-
-1. pxe-bm-instance-creation.rst
-
-2. pxe-bm-installation.rst
-
diff --git a/setup.cfg b/setup.cfg
index c3782024b..ca3f69170 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,8 +37,6 @@ console_scripts =
     nova-api-ec2 = nova.cmd.api_ec2:main
     nova-api-metadata = nova.cmd.api_metadata:main
     nova-api-os-compute = nova.cmd.api_os_compute:main
-    nova-baremetal-deploy-helper = nova.cmd.baremetal_deploy_helper:main
-    nova-baremetal-manage = nova.cmd.baremetal_manage:main
     nova-cells = nova.cmd.cells:main
     nova-cert = nova.cmd.cert:main
     nova-compute = nova.cmd.compute:main