Remove deprecation warning - use "each" without context switching