LB-1511 Leave only server side code for first delivery