Make room for cleanup.
Allow models to be replaced before registration.
Clean up