Some cleanup in LangLinkHandler

Change-Id: I1d42bf7ac9c9f6d184abb0a77d9f95d76dd82682