Remove a couple PayPal internal modules and replace with public alternatives