Clean up conditions before joining