update login, remove ref to object in LHS, cleanup 

Fixes b/17008672, b/17034697