WIP: remove the branch
WIP: fix auth