Fix webserver instance deletion

This change uses the proper filename to reference the services during deletion
and also ensures that directories and services are deleted regardless of whether
webserver was running.