Removed useless function
Removed useless iterator