Clean up register definitions.
Remove some unneeded code