Cleaning up usages of Login