More cleanup of watchdogs, mainly dealing with units