Removed old for loop