Master clean-up. Login changes.