Remove requirement of securerandom