Small refactoring; remove user session