Skip to content

Internal cleanup

Internal cleanup #680