Skip to content

Continue cleanup

Continue cleanup #252