Go back to using foreach
Drop dead code