rearrange defonfig after merge
remove unregister watchdog

it was causing random lockups and crashes