Eliminate CustomerGuid concept from code