fixing all deps issues

Fixes #57 and #58 and cleans up some unused straggler namespaces.

N.B. this pull request is into feature/harvest-all, not develop.