Remove registration cruft