cocoa receive from customer code clean up according to new model.