Purchase Order and Delivery cleanup.