top-level entity remove
Entity removal further work