Removed lots of dependency cruft. Fixes strange build-all issue.