clean orphan elements on garbage collection
Merge branch 'hotfix/clean_orphan_elements'