#673 - remove dead code from AbstractCustomer
#673 - merge cleanup