Fixed a bug with the USPS shipping driver, the Pickup shipping driver, and a bug where options weren't getting deleted.