removed unused assignments in conditions