Fix registration.
Cleanup.