Change session to resource
Remove unnecessary auth checks