cleaning up of spring-social-paypal-openid fork