another wee bit of preliminary cleanup
another wee bit of preliminary cleanup

commshare/civet-webserver,GerHobbelt/civet-webserver,GerHobbelt/civet-webserver,GerHobbelt/civet-webserver,commshare/civet-webserver,GerHobbelt/civet-webserver,GerHobbelt/civet-webserver,commshare/civet-webserver,commshare/civet-webserver,commshare/civet-webserver,GerHobbelt/civet-webserver,commshare/civet-webserver,commshare/civet-webserver