This reverts commit 2a28696de9. Devstack still references a number of these files; revert until devstack incorporates removal. Change-Id: I1e90ceee1f87291668e447f180f37bb809763836
2a28696de9