Feature/token based auth (clean up)