Cleaned up Shipping Prodiver base code.