#781 - clean up AbstractCustomer