cleanup cvs leftovers and unused httpd.conf