EPG-34548 - Remove CustomerService6