clean up conditional variables for data