Removed oAuth namespace, some cleanups