Cleanup port
Handle visitor race condition