remove SupplierContact class, fix PurchaseOrder dependencies