Really remove remaining registration cruft.