Skip to content

Includes cleanup

Includes cleanup #638