Request code improvements, cert removed