Consistent SiteLink naming and dead code removed

I started this patch with uppercasing some "L" in "$siteLink"
variable names and cleaned some more code I came accross while
doing this.

Change-Id: I176df356f2f6a48a79d35327c3786597ed9923fd