Remove all use of getSimpleSiteLink method

Change-Id: I7a06347eb10229c814a97da9a57120e469bf2ee0
Merge "Remove all use of getSimpleSiteLink method"