Revert "Fixing paypal bugs"

This reverts commit e3df476cb1fe416c22364131933b9988cf2055b0.