Removed login class and updated CRP