Use Registry for everything

Next release gets rid of the individual registries completely, right?