remove some crufty code
Merge branch 'master' into oauth2provider