Remove RunAsChild
Add adapter registry and various cleanup