Cleanup registration