Skip to content

cleanup logic

cleanup logic #1249