Add orphan removal to override sets.
Add tests.