Cleanup condition handling