This is a followin from !1738, we no longer need those variables.
Reviewed-by: NRichard Levitte <levitte@openssl.org>