Skip to content

simplify further

simplify further #2442