Remove old login/account code and remove code that was commented out