move remove links into criterion markup