Refactor authentication and delete authorizations table
Fix conflicts