Remove unnecessary bloat, work for waitgroups not a watcher