Remmoved extraneous logging and unnecessary link iteration