Final geard purge - fixes 608 (buildbot failure is probably noise)

Fixes #608.

All remaining gear references and influences that I could find that aren't covered by other PRs already.
Is "unit" still a suitable name, or is it more a geard thing?