Removing usages of Login