Unnecessary BuildLinks() replaced for performance