Remove assignments in conditions