remove not needed object for refactoring
refactor to standard Iterator and standard Countable complete
also removed un-needed classes