n810: More retu-wdt cleanups