Update dependencies, cleanup extraneous go block/loop(s)
tweaks