Cleanup in SimpleSiteLink

Change-Id: I58a5e3a4fbf31a6613c2bc0de4755438fe279ac0