More cleanup after removing references to other placement.