Cleanup.
Removing the dependency on the crypto module.