Feature/oauth

Please remove commented code