cleanup and try to fix config regs