refactor session admin