move sessions out of cache path
move remove links into criterion markup