Remove Register defines