simplify customers. #1919