issue #3: Delete Iterarator hierarchy. Refacrtor.