Removes orphaned elements #8391

Merged
merged 1 commit into from May 3, 2017