More registration code gone

I think this might actually be the last of it.