UI changes

Remove useless iterator