Skip to content

some more cleanup

some more cleanup #701