Removing YDeliver specific code <TC>