Skip to content

Clean up code

Clean up code #4186