Put registry.clear() back