Remove some more CGI interfacing