Remove custom iterable
Merge branch 'feature/one-of' into architector/internal