conditionals removed