Fixes #2: 
access_token should not be sent on query string
Cleanup