Remove EOI handling in lists