Skip to content

Misc cleanup

Misc cleanup #4548