More login system cleanup