Clean up unused code and unintentional LazyIterator property name collision