CurrentCustomer and CurrentAdmin removed