Eliminate use of doregistry table