- Cleanup
- Rejoin issue fix