clean up for conditionals