Additional removal of *For* methods