Geard removal continues - fixes 799

Fixes #799.

This is a complete no-op semantically, all it does is move code out of the `gear` modules.