Minor refactor to not store sessions