Remove double iteration