delete commented-out code
make Iterators and Iterables more legal (fitting the contract etc...)