Remove calls to cgi object