porting OAuth support
Removing unnecessary type tests