Remove dependency on internal scrypt functions