clean up

Conditions cleanup