Api cleanup to remove pointless iterators