Stop using deprecated Item::removeSiteLink method

Change-Id: I974fdefb0b3ebd099e9cbf7df9aecc130cbe4e82
Merge "Stop using deprecated Item::removeSiteLink method"