Minor: Comment cleanup + code simplification

* Removed duplicate condition + simplified code in link handler.
* Deleted some stale comments.

Change-Id: Iae2791fa1aa528b690ff67522ca6e2289f68c873
Merge "Minor: Comment cleanup + code simplification"