[WebServer] Cleanup