Skip to content

Further cleanup

Further cleanup #1977