QA: update login steps for RSpec3, etc.

* also remove unused code

Change-Id: Idc5c10cebddc23524f2c33c44220db698e7985fa