Remove conditionals