Cleanup
Merge pull request #1 from paypal/develop

Cleanup