Feature/remove login