Skip to content

Cleanup and fix

Cleanup and fix #1787