Skip to content

Options cleanup

Options cleanup #1713