Trying to remove some more registration specific code