Remove extra nodes from placement

Change-Id: I41a73c15404c8efa357e0f14a098af174fc54740
Related-PROD: PROD-24486
(cherry picked from commit 5c9607ca6ba1cf1aa029550b0b058cd667efb5d5)
5 files changed