#45 removing local session helpers