More cleanup, InstanceRegistry removed