Additional cleaning on cgi programs