Removed changes in link resolver