Clean up register definition