Skip to content

Utils cleanup

Utils cleanup #2971