Merge pull request #74 from Patater/break-non-crypto-dependencies

Break non-crypto dependencies